From f5646a53966baa519026defb2a7e32e7ea82a5f5 Mon Sep 17 00:00:00 2001 From: sido Date: Thu, 12 Apr 2018 21:08:43 +0200 Subject: [PATCH 1/3] fix(docker-compose): open port 22 to connect to jenkins master --- templates/jenkins/0/docker-compose.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/templates/jenkins/0/docker-compose.yml b/templates/jenkins/0/docker-compose.yml index f86ec24..5976313 100644 --- a/templates/jenkins/0/docker-compose.yml +++ b/templates/jenkins/0/docker-compose.yml @@ -16,6 +16,8 @@ services: jenkins-agent-buildtools: image: registry.molgenis.org/docker-molgenis-ops-releases/jenkins-agent-buildtools:latest + ports: + - 22 volumes: - molgenis-jenkins-agent-buildtools:/var/jenkins_home From 1d47094927ee4fc1cd96a51276ca49e64fa08db3 Mon Sep 17 00:00:00 2001 From: sido Date: Mon, 16 Apr 2018 16:37:27 +0200 Subject: [PATCH 2/3] fix(docker-compose): updated nexus with mount options --- templates/jenkins/0/docker-compose.yml | 2 ++ templates/nexus/0/docker-compose.yml | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/templates/jenkins/0/docker-compose.yml b/templates/jenkins/0/docker-compose.yml index 5976313..952613a 100644 --- a/templates/jenkins/0/docker-compose.yml +++ b/templates/jenkins/0/docker-compose.yml @@ -18,6 +18,8 @@ services: image: registry.molgenis.org/docker-molgenis-ops-releases/jenkins-agent-buildtools:latest ports: - 22 + environment: + JENKINS_SLAVE_SSH_PUBKEY= volumes: - molgenis-jenkins-agent-buildtools:/var/jenkins_home diff --git a/templates/nexus/0/docker-compose.yml b/templates/nexus/0/docker-compose.yml index 8128d84..85f2572 100644 --- a/templates/nexus/0/docker-compose.yml +++ b/templates/nexus/0/docker-compose.yml @@ -16,4 +16,7 @@ services: volumes: molgenis-nexus-data: - driver: rancher-nfs \ No newline at end of file + driver: rancher-nfs + driver_opts: + mountOpts: all_squash,anonuid=200,anongid=200 + onRemove: purge From ddfe409abfcb510b57723b3af346a034d4cca050 Mon Sep 17 00:00:00 2001 From: sido Date: Mon, 16 Apr 2018 16:43:11 +0200 Subject: [PATCH 3/3] fix(docker-compose): update volume to relative name --- templates/nexus/0/docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/nexus/0/docker-compose.yml b/templates/nexus/0/docker-compose.yml index 85f2572..75e8e6e 100644 --- a/templates/nexus/0/docker-compose.yml +++ b/templates/nexus/0/docker-compose.yml @@ -6,7 +6,7 @@ services: ports: - 8081 volumes: - - molgenis-nexus-data:/nexus-data + - nexus-data:/nexus-data labels: io.rancher.container.pull_image: always traefik.frontend.rule: Host:${DOMAINS} @@ -15,7 +15,7 @@ services: traefik.port: 8081 volumes: - molgenis-nexus-data: + nexus-data: driver: rancher-nfs driver_opts: mountOpts: all_squash,anonuid=200,anongid=200