Merge pull request #181 from sbesson/dockerignore_cache

Add .cache folder to .dockerignore for server, slave and web containers

.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

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"]

server/.dockerignore

@@ -2,3 +2,4 @@ omero-server-data
 workspace
 .jenkins
 .local
+.cache

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"]

slave/.dockerignore

@@ -1,3 +1,4 @@
 workspace
 .jenkins
 .local
+.cache

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"]

web/.dockerignore

@@ -1,3 +1,4 @@
 workspace
 .jenkins
 .local
+.cache

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"]