From 45a3d44e3d0e80e5e57ac7704905699b8c92ec89 Mon Sep 17 00:00:00 2001
From: jurgenhaas <juergen@paragon-es.de>
Date: Wed, 25 Sep 2019 08:20:45 +0200
Subject: [PATCH] #33 Improve reset feature
---
run/scripts/update | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/run/scripts/update b/run/scripts/update
index 43a8c25..9c94789 100755
--- a/run/scripts/update
+++ b/run/scripts/update
@@ -3,7 +3,11 @@
function cleanup {
NEWIMAGEID=$(docker image ls -q registry.lakedrops.com/docker/l3d/php-${PHP_VERSION}:${VERSION} | head -1)
while true; do
- IMAGEID=$(docker image ls -q registry.lakedrops.com/docker/l3d/php-${PHP_VERSION} | grep -v ${NEWIMAGEID})
+ if [[ $L3D_FORCE_UPDATE -eq 1 ]]; then
+ IMAGEID=$(docker image ls -q registry.lakedrops.com/docker/l3d/php-${PHP_VERSION})
+ else
+ IMAGEID=$(docker image ls -q registry.lakedrops.com/docker/l3d/php-${PHP_VERSION} | grep -v ${NEWIMAGEID})
+ fi
if [[ -n ${IMAGEID} ]]; then
while true; do
ID=$(docker container ls --all -q -f ancestor=${IMAGEID})
@@ -15,8 +19,10 @@ function cleanup {
break
fi
done
- echo "Removing outdated image ..."
- docker rmi ${IMAGEID} >/dev/null
+ if [[ $L3D_FORCE_UPDATE -eq 0 ]]; then
+ echo "Removing outdated image ..."
+ docker rmi ${IMAGEID} >/dev/null
+ fi
else
break
fi
--
GitLab