From 8a5460bb3dd7e3c46ab22aa6a1405cad23c9c11b Mon Sep 17 00:00:00 2001 From: Sebastien Besson Date: Tue, 15 Jun 2021 09:03:22 +0100 Subject: [PATCH 1/3] Add .cache folder to .dockerignore for server, slave and web containers --- server/.dockerignore | 1 + slave/.dockerignore | 1 + web/.dockerignore | 1 + 3 files changed, 3 insertions(+) diff --git a/server/.dockerignore b/server/.dockerignore index 26a3f3a5..31de25e8 100644 --- a/server/.dockerignore +++ b/server/.dockerignore @@ -2,3 +2,4 @@ omero-server-data workspace .jenkins .local +.cache diff --git a/slave/.dockerignore b/slave/.dockerignore index ec55e07b..13815f12 100644 --- a/slave/.dockerignore +++ b/slave/.dockerignore @@ -1,3 +1,4 @@ workspace .jenkins .local +.cache diff --git a/web/.dockerignore b/web/.dockerignore index ec55e07b..13815f12 100644 --- a/web/.dockerignore +++ b/web/.dockerignore @@ -1,3 +1,4 @@ workspace .jenkins .local +.cache From 7b2da5e6cd4f7d97c2e62cb9b9b0f028df117616 Mon Sep 17 00:00:00 2001 From: Sebastien Besson Date: Wed, 16 Jun 2021 09:20:07 +0100 Subject: [PATCH 2/3] Add Docker version --- .github/workflows/build.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 42084eeb..92437e2c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,6 +19,8 @@ jobs: ./rename.py travis ./sslcert jenkins/sslcert localhost ./sslcert nginx/sslcert localhost + - name: Display Docker version + run: docker version - name: Build run: docker-compose -f docker-compose.yml build - name: Run tests From 6b1081120b05edb8fa3d82d01095151ccc7e34c2 Mon Sep 17 00:00:00 2001 From: Sebastien Besson Date: Thu, 17 Jun 2021 13:30:36 +0100 Subject: [PATCH 3/3] Use double quotes rather than single quotes for VOLUME --- nginx/Dockerfile | 2 +- server/Dockerfile | 2 +- slave/Dockerfile | 2 +- web/Dockerfile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/nginx/Dockerfile b/nginx/Dockerfile index 16ab630d..3a0574e5 100644 --- a/nginx/Dockerfile +++ b/nginx/Dockerfile @@ -33,7 +33,7 @@ RUN usermod -u $USER_ID omero RUN mkdir -p /home/omero/static RUN chown -R omero:omero /home/omero/static -VOLUME ['/etc/nginx/conf.d', '/home/omero/static', '/var/log/nginx', '/etc/nginx/ssl'] +VOLUME ["/etc/nginx/conf.d", "/home/omero/static", "/var/log/nginx", "/etc/nginx/ssl"] USER omero CMD ["/tmp/run.sh"] diff --git a/server/Dockerfile b/server/Dockerfile index 96441d8d..0ea8e219 100644 --- a/server/Dockerfile +++ b/server/Dockerfile @@ -78,7 +78,7 @@ ARG USER_ID=1000 RUN usermod -u $USER_ID omero # make sure mounted volumes has correct permissions -VOLUME ['/home/omero'] +VOLUME ["/home/omero"] USER omero CMD ["/tmp/run.sh"] diff --git a/slave/Dockerfile b/slave/Dockerfile index c73efea0..68fa231a 100644 --- a/slave/Dockerfile +++ b/slave/Dockerfile @@ -90,7 +90,7 @@ ARG USER_ID=1000 RUN usermod -u $USER_ID omero # make sure mounted volumes has correct permissions -VOLUME ['/home/omero'] +VOLUME ["/home/omero"] USER omero CMD ["/tmp/run.sh"] diff --git a/web/Dockerfile b/web/Dockerfile index 38fa456f..db139387 100644 --- a/web/Dockerfile +++ b/web/Dockerfile @@ -81,7 +81,7 @@ RUN usermod -u $USER_ID omero RUN mkdir -p /home/omero/nginx RUN chown -R omero:omero /home/omero/nginx -VOLUME ['/home/omero', '/home/omero/nginx'] +VOLUME ["/home/omero", "/home/omero/nginx"] USER omero CMD ["/tmp/run.sh"]