From 4174e39f2bf605bd10b8d8f09339b9c49d4f5f30 Mon Sep 17 00:00:00 2001 From: szaimen Date: Tue, 7 Dec 2021 18:35:18 +0100 Subject: [PATCH 1/3] run image prune and volume prune regularly Signed-off-by: szaimen --- Containers/mastercontainer/Dockerfile | 3 +++ Containers/mastercontainer/cron.sh | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Containers/mastercontainer/Dockerfile b/Containers/mastercontainer/Dockerfile index bb91edcd..bbefd653 100644 --- a/Containers/mastercontainer/Dockerfile +++ b/Containers/mastercontainer/Dockerfile @@ -26,6 +26,9 @@ RUN curl "https://caddyserver.com/api/download?os=linux&arch=amd64" -o "/usr/bin && chmod +x /usr/bin/caddy \ && /usr/bin/caddy version +COPY --from=docker:dind /usr/local/bin/docker /usr/local/bin/ +RUN chmod +x /usr/local/bin/docker + RUN cd /var/www/docker-aio; \ git clone https://github.com/nextcloud/all-in-one.git .; \ chmod 770 -R ./; \ diff --git a/Containers/mastercontainer/cron.sh b/Containers/mastercontainer/cron.sh index 31e1d619..cd9c9b6d 100644 --- a/Containers/mastercontainer/cron.sh +++ b/Containers/mastercontainer/cron.sh @@ -1,7 +1,9 @@ #!/bin/sh -set -eu +set -eux while true; do sudo -u www-data php /var/www/docker-aio/php/src/Cron/cron.php + sudo -u www-data docker image prune -f + sudo -u www-data docker volume prune -f sleep 1d done From b0fc3fb9531c82854aced3366b3ace3972786ffc Mon Sep 17 00:00:00 2001 From: szaimen Date: Wed, 8 Dec 2021 22:35:09 +0100 Subject: [PATCH 2/3] address review Signed-off-by: szaimen --- Containers/mastercontainer/cron.sh | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/Containers/mastercontainer/cron.sh b/Containers/mastercontainer/cron.sh index cd9c9b6d..b0019f85 100644 --- a/Containers/mastercontainer/cron.sh +++ b/Containers/mastercontainer/cron.sh @@ -2,8 +2,16 @@ set -eux while true; do + # Check for updates and send notification if yes sudo -u www-data php /var/www/docker-aio/php/src/Cron/cron.php + # Remove dangling images sudo -u www-data docker image prune -f - sudo -u www-data docker volume prune -f + # Remove dangling volumes + unset DANGLING_VOLUMES + DANGLING_VOLUMES="$(sudo -u www-data docker volume ls --filter dangling=true | awk '{print $2}' | grep -v "nextcloud_aio_\|^VOLUME$")" + mapfile -t DANGLING_VOLUMES <<< "$DANGLING_VOLUMES" + for volume in "${DANGLING_VOLUMES[@]}"; do + sudo -u www-data docker volume rm "$volume" + done sleep 1d done From 3206ce4d16229ade6a3a5f825711432516789850 Mon Sep 17 00:00:00 2001 From: szaimen Date: Wed, 15 Dec 2021 13:07:39 +0100 Subject: [PATCH 3/3] remove volume prune as we don't want to risk anything Signed-off-by: szaimen --- Containers/mastercontainer/cron.sh | 7 ------- 1 file changed, 7 deletions(-) diff --git a/Containers/mastercontainer/cron.sh b/Containers/mastercontainer/cron.sh index b0019f85..cf1b8d21 100644 --- a/Containers/mastercontainer/cron.sh +++ b/Containers/mastercontainer/cron.sh @@ -6,12 +6,5 @@ while true; do sudo -u www-data php /var/www/docker-aio/php/src/Cron/cron.php # Remove dangling images sudo -u www-data docker image prune -f - # Remove dangling volumes - unset DANGLING_VOLUMES - DANGLING_VOLUMES="$(sudo -u www-data docker volume ls --filter dangling=true | awk '{print $2}' | grep -v "nextcloud_aio_\|^VOLUME$")" - mapfile -t DANGLING_VOLUMES <<< "$DANGLING_VOLUMES" - for volume in "${DANGLING_VOLUMES[@]}"; do - sudo -u www-data docker volume rm "$volume" - done sleep 1d done