From d8f496921223a923d81454b3c7429efb66c9c1f0 Mon Sep 17 00:00:00 2001
From: Chris Pomeroy <chris.pomeroy@hotmail.com>
Date: Sun, 04 Apr 2021 05:03:07 +0000
Subject: [PATCH] Updated to build correctly
---
Jenkinsfile | 5 ++++-
docker-compose.yml | 9 +++++++++
2 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 603a10b..38a0fbb 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -4,7 +4,7 @@
pipeline{
agent{
- label "master"
+ label "x86-docker-agent"
}
environment{
def BUILDDATE = sh(script: "echo `date --rfc-3339=date`", returnStdout: true).trim()
@@ -47,6 +47,9 @@
}
}
}
+ stage('Deploy service to dev'){
+
+ }
}
post{
success {
diff --git a/docker-compose.yml b/docker-compose.yml
index 1de524c..e7ee1da 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -14,7 +14,13 @@
image: ${IMAGE}
networks:
agents:
+ aliases:
+ - jenkins.darkurthe.net
traefik_default:
+ logging:
+ options:
+ max-size: "10m"
+ max-file: "3"
deploy:
placement:
constraints:
@@ -29,6 +35,9 @@
- traefik.http.routers.jenkins.rule=Host( "jenkins.darkurthe.net" )
- traefik.http.routers.jenkins.entrypoints=web
- traefik.http.services.jenkins-service.loadbalancer.server.port=8080
+ # - traefik.tcp.routers.jenkins.entrypoints=jenkins-agents
+ # - traefik.tcp.routers.jenkins.rule=Host( "jenkins.darkurthe.net" )
+ # - traefik.tcp.services.jenkins.loadbalancer.server.port=40981
# - traefik.http.routers.jenkins.tls=true
# - traefik.http.routers.jenkins.tls.certresolver=myresolver
volumes:
--
Gitblit v1.10.0