From 3f08a762f5c8076f4b440a5bf13b4eb085b33168 Mon Sep 17 00:00:00 2001 From: cytopia Date: Mon, 24 Dec 2018 12:19:42 +0100 Subject: [PATCH] Use Docker VOLUME sections only where applicable --- Dockerfiles/prod/Dockerfile-5.2 | 3 --- Dockerfiles/prod/Dockerfile-5.3 | 3 --- Dockerfiles/prod/Dockerfile-5.4 | 3 --- Dockerfiles/prod/Dockerfile-5.5 | 3 --- Dockerfiles/prod/Dockerfile-5.6 | 3 --- Dockerfiles/prod/Dockerfile-7.0 | 3 --- Dockerfiles/prod/Dockerfile-7.1 | 3 --- Dockerfiles/prod/Dockerfile-7.2 | 3 --- Dockerfiles/prod/Dockerfile-7.3 | 3 --- Dockerfiles/prod/Dockerfile-7.4 | 3 --- Dockerfiles/work/Dockerfile-5.2 | 4 ---- Dockerfiles/work/Dockerfile-5.3 | 4 ---- Dockerfiles/work/Dockerfile-5.4 | 4 ---- Dockerfiles/work/Dockerfile-5.5 | 4 ---- Dockerfiles/work/Dockerfile-5.6 | 4 ---- Dockerfiles/work/Dockerfile-7.0 | 4 ---- Dockerfiles/work/Dockerfile-7.1 | 4 ---- Dockerfiles/work/Dockerfile-7.2 | 4 ---- Dockerfiles/work/Dockerfile-7.3 | 4 ---- Dockerfiles/work/Dockerfile-7.4 | 4 ---- build/ansible/DOCKERFILES/Dockerfile-prod.j2 | 3 --- build/ansible/DOCKERFILES/Dockerfile-work.j2 | 4 ---- 22 files changed, 77 deletions(-) diff --git a/Dockerfiles/prod/Dockerfile-5.2 b/Dockerfiles/prod/Dockerfile-5.2 index 4e30707..b172931 100644 --- a/Dockerfiles/prod/Dockerfile-5.2 +++ b/Dockerfiles/prod/Dockerfile-5.2 @@ -72,9 +72,6 @@ COPY ./data/supervisord.conf /etc/supervisor/supervisord.conf ### ### Volumes ### -VOLUME /etc/php-custom.d -VOLUME /etc/php-fpm-custom.d -VOLUME /etc/php-modules.d VOLUME /var/log/php VOLUME /var/mail diff --git a/Dockerfiles/prod/Dockerfile-5.3 b/Dockerfiles/prod/Dockerfile-5.3 index 632c848..75aa343 100644 --- a/Dockerfiles/prod/Dockerfile-5.3 +++ b/Dockerfiles/prod/Dockerfile-5.3 @@ -72,9 +72,6 @@ COPY ./data/supervisord.conf /etc/supervisor/supervisord.conf ### ### Volumes ### -VOLUME /etc/php-custom.d -VOLUME /etc/php-fpm-custom.d -VOLUME /etc/php-modules.d VOLUME /var/log/php VOLUME /var/mail diff --git a/Dockerfiles/prod/Dockerfile-5.4 b/Dockerfiles/prod/Dockerfile-5.4 index 5aac5d8..78c6b13 100644 --- a/Dockerfiles/prod/Dockerfile-5.4 +++ b/Dockerfiles/prod/Dockerfile-5.4 @@ -72,9 +72,6 @@ COPY ./data/supervisord.conf /etc/supervisor/supervisord.conf ### ### Volumes ### -VOLUME /etc/php-custom.d -VOLUME /etc/php-fpm-custom.d -VOLUME /etc/php-modules.d VOLUME /var/log/php VOLUME /var/mail diff --git a/Dockerfiles/prod/Dockerfile-5.5 b/Dockerfiles/prod/Dockerfile-5.5 index 6d21f47..6119145 100644 --- a/Dockerfiles/prod/Dockerfile-5.5 +++ b/Dockerfiles/prod/Dockerfile-5.5 @@ -72,9 +72,6 @@ COPY ./data/supervisord.conf /etc/supervisor/supervisord.conf ### ### Volumes ### -VOLUME /etc/php-custom.d -VOLUME /etc/php-fpm-custom.d -VOLUME /etc/php-modules.d VOLUME /var/log/php VOLUME /var/mail diff --git a/Dockerfiles/prod/Dockerfile-5.6 b/Dockerfiles/prod/Dockerfile-5.6 index 32927d9..f28b418 100644 --- a/Dockerfiles/prod/Dockerfile-5.6 +++ b/Dockerfiles/prod/Dockerfile-5.6 @@ -72,9 +72,6 @@ COPY ./data/supervisord.conf /etc/supervisor/supervisord.conf ### ### Volumes ### -VOLUME /etc/php-custom.d -VOLUME /etc/php-fpm-custom.d -VOLUME /etc/php-modules.d VOLUME /var/log/php VOLUME /var/mail diff --git a/Dockerfiles/prod/Dockerfile-7.0 b/Dockerfiles/prod/Dockerfile-7.0 index cfd1d08..b22b606 100644 --- a/Dockerfiles/prod/Dockerfile-7.0 +++ b/Dockerfiles/prod/Dockerfile-7.0 @@ -72,9 +72,6 @@ COPY ./data/supervisord.conf /etc/supervisor/supervisord.conf ### ### Volumes ### -VOLUME /etc/php-custom.d -VOLUME /etc/php-fpm-custom.d -VOLUME /etc/php-modules.d VOLUME /var/log/php VOLUME /var/mail diff --git a/Dockerfiles/prod/Dockerfile-7.1 b/Dockerfiles/prod/Dockerfile-7.1 index badd9f0..ce8f18e 100644 --- a/Dockerfiles/prod/Dockerfile-7.1 +++ b/Dockerfiles/prod/Dockerfile-7.1 @@ -72,9 +72,6 @@ COPY ./data/supervisord.conf /etc/supervisor/supervisord.conf ### ### Volumes ### -VOLUME /etc/php-custom.d -VOLUME /etc/php-fpm-custom.d -VOLUME /etc/php-modules.d VOLUME /var/log/php VOLUME /var/mail diff --git a/Dockerfiles/prod/Dockerfile-7.2 b/Dockerfiles/prod/Dockerfile-7.2 index 37de975..a669405 100644 --- a/Dockerfiles/prod/Dockerfile-7.2 +++ b/Dockerfiles/prod/Dockerfile-7.2 @@ -72,9 +72,6 @@ COPY ./data/supervisord.conf /etc/supervisor/supervisord.conf ### ### Volumes ### -VOLUME /etc/php-custom.d -VOLUME /etc/php-fpm-custom.d -VOLUME /etc/php-modules.d VOLUME /var/log/php VOLUME /var/mail diff --git a/Dockerfiles/prod/Dockerfile-7.3 b/Dockerfiles/prod/Dockerfile-7.3 index 83f108b..4d18730 100644 --- a/Dockerfiles/prod/Dockerfile-7.3 +++ b/Dockerfiles/prod/Dockerfile-7.3 @@ -72,9 +72,6 @@ COPY ./data/supervisord.conf /etc/supervisor/supervisord.conf ### ### Volumes ### -VOLUME /etc/php-custom.d -VOLUME /etc/php-fpm-custom.d -VOLUME /etc/php-modules.d VOLUME /var/log/php VOLUME /var/mail diff --git a/Dockerfiles/prod/Dockerfile-7.4 b/Dockerfiles/prod/Dockerfile-7.4 index 0cace17..cae332c 100644 --- a/Dockerfiles/prod/Dockerfile-7.4 +++ b/Dockerfiles/prod/Dockerfile-7.4 @@ -72,9 +72,6 @@ COPY ./data/supervisord.conf /etc/supervisor/supervisord.conf ### ### Volumes ### -VOLUME /etc/php-custom.d -VOLUME /etc/php-fpm-custom.d -VOLUME /etc/php-modules.d VOLUME /var/log/php VOLUME /var/mail diff --git a/Dockerfiles/work/Dockerfile-5.2 b/Dockerfiles/work/Dockerfile-5.2 index ad3a0d3..3f4e3be 100644 --- a/Dockerfiles/work/Dockerfile-5.2 +++ b/Dockerfiles/work/Dockerfile-5.2 @@ -328,10 +328,6 @@ COPY ./data/sudo-devilbox /etc/sudoers.d/devilbox ### ### Volumes ### -VOLUME /etc/bashrc-devilbox.d -VOLUME /etc/php-custom.d -VOLUME /etc/php-fpm-custom.d -VOLUME /etc/php-modules.d VOLUME /shared/backups VOLUME /var/log/php VOLUME /var/mail diff --git a/Dockerfiles/work/Dockerfile-5.3 b/Dockerfiles/work/Dockerfile-5.3 index 872ba7c..64af1ce 100644 --- a/Dockerfiles/work/Dockerfile-5.3 +++ b/Dockerfiles/work/Dockerfile-5.3 @@ -371,10 +371,6 @@ COPY ./data/sudo-devilbox /etc/sudoers.d/devilbox ### ### Volumes ### -VOLUME /etc/bashrc-devilbox.d -VOLUME /etc/php-custom.d -VOLUME /etc/php-fpm-custom.d -VOLUME /etc/php-modules.d VOLUME /shared/backups VOLUME /var/log/php VOLUME /var/mail diff --git a/Dockerfiles/work/Dockerfile-5.4 b/Dockerfiles/work/Dockerfile-5.4 index 1b3b661..b499520 100644 --- a/Dockerfiles/work/Dockerfile-5.4 +++ b/Dockerfiles/work/Dockerfile-5.4 @@ -404,10 +404,6 @@ COPY ./data/sudo-devilbox /etc/sudoers.d/devilbox ### ### Volumes ### -VOLUME /etc/bashrc-devilbox.d -VOLUME /etc/php-custom.d -VOLUME /etc/php-fpm-custom.d -VOLUME /etc/php-modules.d VOLUME /shared/backups VOLUME /var/log/php VOLUME /var/mail diff --git a/Dockerfiles/work/Dockerfile-5.5 b/Dockerfiles/work/Dockerfile-5.5 index 9f559dc..29191df 100644 --- a/Dockerfiles/work/Dockerfile-5.5 +++ b/Dockerfiles/work/Dockerfile-5.5 @@ -418,10 +418,6 @@ COPY ./data/sudo-devilbox /etc/sudoers.d/devilbox ### ### Volumes ### -VOLUME /etc/bashrc-devilbox.d -VOLUME /etc/php-custom.d -VOLUME /etc/php-fpm-custom.d -VOLUME /etc/php-modules.d VOLUME /shared/backups VOLUME /var/log/php VOLUME /var/mail diff --git a/Dockerfiles/work/Dockerfile-5.6 b/Dockerfiles/work/Dockerfile-5.6 index bd96cc5..61a8d28 100644 --- a/Dockerfiles/work/Dockerfile-5.6 +++ b/Dockerfiles/work/Dockerfile-5.6 @@ -432,10 +432,6 @@ COPY ./data/sudo-devilbox /etc/sudoers.d/devilbox ### ### Volumes ### -VOLUME /etc/bashrc-devilbox.d -VOLUME /etc/php-custom.d -VOLUME /etc/php-fpm-custom.d -VOLUME /etc/php-modules.d VOLUME /shared/backups VOLUME /var/log/php VOLUME /var/mail diff --git a/Dockerfiles/work/Dockerfile-7.0 b/Dockerfiles/work/Dockerfile-7.0 index 914662d..d1429a9 100644 --- a/Dockerfiles/work/Dockerfile-7.0 +++ b/Dockerfiles/work/Dockerfile-7.0 @@ -432,10 +432,6 @@ COPY ./data/sudo-devilbox /etc/sudoers.d/devilbox ### ### Volumes ### -VOLUME /etc/bashrc-devilbox.d -VOLUME /etc/php-custom.d -VOLUME /etc/php-fpm-custom.d -VOLUME /etc/php-modules.d VOLUME /shared/backups VOLUME /var/log/php VOLUME /var/mail diff --git a/Dockerfiles/work/Dockerfile-7.1 b/Dockerfiles/work/Dockerfile-7.1 index 4660996..9158f49 100644 --- a/Dockerfiles/work/Dockerfile-7.1 +++ b/Dockerfiles/work/Dockerfile-7.1 @@ -432,10 +432,6 @@ COPY ./data/sudo-devilbox /etc/sudoers.d/devilbox ### ### Volumes ### -VOLUME /etc/bashrc-devilbox.d -VOLUME /etc/php-custom.d -VOLUME /etc/php-fpm-custom.d -VOLUME /etc/php-modules.d VOLUME /shared/backups VOLUME /var/log/php VOLUME /var/mail diff --git a/Dockerfiles/work/Dockerfile-7.2 b/Dockerfiles/work/Dockerfile-7.2 index ea0b1cf..63ed863 100644 --- a/Dockerfiles/work/Dockerfile-7.2 +++ b/Dockerfiles/work/Dockerfile-7.2 @@ -432,10 +432,6 @@ COPY ./data/sudo-devilbox /etc/sudoers.d/devilbox ### ### Volumes ### -VOLUME /etc/bashrc-devilbox.d -VOLUME /etc/php-custom.d -VOLUME /etc/php-fpm-custom.d -VOLUME /etc/php-modules.d VOLUME /shared/backups VOLUME /var/log/php VOLUME /var/mail diff --git a/Dockerfiles/work/Dockerfile-7.3 b/Dockerfiles/work/Dockerfile-7.3 index c98b19c..c812fe5 100644 --- a/Dockerfiles/work/Dockerfile-7.3 +++ b/Dockerfiles/work/Dockerfile-7.3 @@ -420,10 +420,6 @@ COPY ./data/sudo-devilbox /etc/sudoers.d/devilbox ### ### Volumes ### -VOLUME /etc/bashrc-devilbox.d -VOLUME /etc/php-custom.d -VOLUME /etc/php-fpm-custom.d -VOLUME /etc/php-modules.d VOLUME /shared/backups VOLUME /var/log/php VOLUME /var/mail diff --git a/Dockerfiles/work/Dockerfile-7.4 b/Dockerfiles/work/Dockerfile-7.4 index 15713a2..64e5253 100644 --- a/Dockerfiles/work/Dockerfile-7.4 +++ b/Dockerfiles/work/Dockerfile-7.4 @@ -420,10 +420,6 @@ COPY ./data/sudo-devilbox /etc/sudoers.d/devilbox ### ### Volumes ### -VOLUME /etc/bashrc-devilbox.d -VOLUME /etc/php-custom.d -VOLUME /etc/php-fpm-custom.d -VOLUME /etc/php-modules.d VOLUME /shared/backups VOLUME /var/log/php VOLUME /var/mail diff --git a/build/ansible/DOCKERFILES/Dockerfile-prod.j2 b/build/ansible/DOCKERFILES/Dockerfile-prod.j2 index 639fe99..939694e 100644 --- a/build/ansible/DOCKERFILES/Dockerfile-prod.j2 +++ b/build/ansible/DOCKERFILES/Dockerfile-prod.j2 @@ -74,9 +74,6 @@ COPY ./data/supervisord.conf /etc/supervisor/supervisord.conf ### ### Volumes ### -VOLUME /etc/php-custom.d -VOLUME /etc/php-fpm-custom.d -VOLUME /etc/php-modules.d VOLUME /var/log/php VOLUME /var/mail diff --git a/build/ansible/DOCKERFILES/Dockerfile-work.j2 b/build/ansible/DOCKERFILES/Dockerfile-work.j2 index 6e1be43..475f4a1 100644 --- a/build/ansible/DOCKERFILES/Dockerfile-work.j2 +++ b/build/ansible/DOCKERFILES/Dockerfile-work.j2 @@ -246,10 +246,6 @@ COPY ./data/sudo-devilbox /etc/sudoers.d/devilbox ### ### Volumes ### -VOLUME /etc/bashrc-devilbox.d -VOLUME /etc/php-custom.d -VOLUME /etc/php-fpm-custom.d -VOLUME /etc/php-modules.d VOLUME /shared/backups VOLUME /var/log/php VOLUME /var/mail