From ffb4cf045bfea703539f1d783e1f8478d2ddf87b Mon Sep 17 00:00:00 2001
From: jurgenhaas <juergen@paragon-es.de>
Date: Thu, 7 Jan 2021 09:21:54 +0100
Subject: [PATCH] Load the run image after setup and selfupdate
---
run/scripts/selfupdate | 10 +++++-----
setup/scripts/setup | 1 +
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/run/scripts/selfupdate b/run/scripts/selfupdate
index 9c6be23..38e0226 100755
--- a/run/scripts/selfupdate
+++ b/run/scripts/selfupdate
@@ -11,14 +11,15 @@ if [[ "$NEWVERSION" == "" ]]; then
exit
fi
+export L3DVERSION=${NEWVERSION}
echo "Loading new version ..."
-UPDATE=$(docker run -v ${SCRIPTPATH}:/setup --rm registry.lakedrops.com/docker/l3d/setup:${NEWVERSION} 2>&1)
-if [[ "$UPDATE" == *"setup:${NEWVERSION} not found"* ]]; then
- echo "Version ${NEWVERSION} not found."
+UPDATE=$(docker run -v ${SCRIPTPATH}:/setup --rm registry.lakedrops.com/docker/l3d/setup:${L3DVERSION} 2>&1)
+if [[ "$UPDATE" == *"setup:${L3DVERSION} not found"* ]]; then
+ echo "Version ${L3DVERSION} not found."
exit
fi
-echo "Self update to version ${NEWVERSION} succeeded!"
+echo "Self update to version ${L3DVERSION} succeeded!"
echo ""
echo ""
echo ""
@@ -35,6 +36,5 @@ echo ""
echo ""
echo ""
-export L3DVERSION=${NEWVERSION}
export L3D_FORCE_UPDATE=0
/usr/local/bin/reset
diff --git a/setup/scripts/setup b/setup/scripts/setup
index eff9362..c47ec68 100755
--- a/setup/scripts/setup
+++ b/setup/scripts/setup
@@ -2,6 +2,7 @@
cp /usr/local/bin/l3d /setup/l3d
cp /usr/local/bin/prepareMac4L3d /setup/prepareMac4L3d
+docker pull registry.lakedrops.com/docker/l3d/run:${L3DVERSION} 2>&1
echo "L3D installed successfully!"
echo ""
--
GitLab