From 5e8967002e7082823ad9094d466ebf0bcb5a25e0 Mon Sep 17 00:00:00 2001
From: Stefan Reimer <stefan@zero-downtime.net>
Date: Sat, 12 Mar 2022 17:56:14 +0000
Subject: [PATCH] always apk upgrade builder VM, fix --clean of symlinked dirs

Fix for softlinks to directories during --clean / always use latest packages within a release at build time to pick up latest security fixes etc.
---
 build         | 2 +-
 scripts/setup | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/build b/build
index ba5b84b..f269bf9 100755
--- a/build
+++ b/build
@@ -95,7 +95,7 @@ def clean_work():
     for x in (set(os.listdir('work')) - WORK_CLEAN):
         x = os.path.join('work', x)
         log.debug('removing %s', x)
-        if os.path.isdir(x):
+        if os.path.isdir(x) and not os.path.islink(x):
             shutil.rmtree(x)
         else:
             os.unlink(x)
diff --git a/scripts/setup b/scripts/setup
index 29aff42..8f00d29 100755
--- a/scripts/setup
+++ b/scripts/setup
@@ -22,6 +22,8 @@ setup_builder() {
     einfo "Setting up Builder Instance"
     setup-apkrepos -1   # main repo via dl-cdn
     # ODO? also uncomment community repo?
+    # Always use latest versions within the release, security patches etc.
+    apk upgrade --no-cache --available
     apk --no-cache add \
         e2fsprogs \
         dosfstools \