Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 3 commits into from
Jun 17, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion nginx/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
1 change: 1 addition & 0 deletions server/.dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@ omero-server-data
workspace
.jenkins
.local
.cache
2 changes: 1 addition & 1 deletion server/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
1 change: 1 addition & 0 deletions slave/.dockerignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
workspace
.jenkins
.local
.cache
2 changes: 1 addition & 1 deletion slave/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
1 change: 1 addition & 0 deletions web/.dockerignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
workspace
.jenkins
.local
.cache
2 changes: 1 addition & 1 deletion web/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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"]