diff --git a/dockerfiles/services/jenkins/docker-compose.yml b/dockerfiles/services/jenkins/docker-compose.yml index fd6dd98..1f2a9f5 100644 --- a/dockerfiles/services/jenkins/docker-compose.yml +++ b/dockerfiles/services/jenkins/docker-compose.yml @@ -2,18 +2,21 @@ # DOCKER_HOST=192.168.2.41:2376 docker-compose up -d # DOCKER_HOST=dkhost:2376 docker stack deploy -c docker-compose.yml jenkins -version: '3' +version: '3.4' +volumes: + jenkins_home: + services: app: # restart: always # privileged: true - image: "jenkins:alpine" + image: "jenkins/jenkins:lts" volumes: - - /var/lib/jenkins:/var/jenkins_home + - jenkins_home:/var/jenkins_home ports: - - "8080:8080" - - "50000:50000" + - "8080:8080" + - "50000:50000" deploy: mode: replicated replicas: 1 @@ -24,7 +27,7 @@ services: resources: limits: cpus: '2' - memory: 1024M + memory: 1536M logging: driver: fluentd @@ -32,7 +35,19 @@ services: fluentd-address: "logs.xai-corp.net:24224" tag: jenkins -#networks: -# default: -# external: -# name: prod + networks: + - prod_ui + +networks: + prod_ui: + external: + name: prod_ui + prod_db: + external: + name: prod_db + prod_cache: + external: + name: prod_cache + prod_app: + external: + name: prod_app diff --git a/dockerfiles/services/sslproxy/hosts-disabled/jenkins.xai-corp.net.conf b/dockerfiles/services/sslproxy/hosts/jenkins.xai-corp.net.conf similarity index 100% rename from dockerfiles/services/sslproxy/hosts-disabled/jenkins.xai-corp.net.conf rename to dockerfiles/services/sslproxy/hosts/jenkins.xai-corp.net.conf