From 6bc598ba0fd3a0b0beed1cae0e9a9130fb4919c7 Mon Sep 17 00:00:00 2001
From: Sam Heinz <54530346+asylumexp@users.noreply.github.com>
Date: Sun, 30 Jun 2024 23:04:45 +1000
Subject: [PATCH] testing alpine 3.20

---
 ct/alpine-docker.sh | 2 +-
 ct/create_lxc.sh    | 9 +++++----
 misc/build.func     | 4 ++--
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/ct/alpine-docker.sh b/ct/alpine-docker.sh
index 5fadf9914..55142c7cf 100644
--- a/ct/alpine-docker.sh
+++ b/ct/alpine-docker.sh
@@ -24,7 +24,7 @@ var_disk="2"
 var_cpu="1"
 var_ram="1024"
 var_os="alpine"
-var_version="3.19"
+var_version="3.20"
 variables
 color
 catch_errors
diff --git a/ct/create_lxc.sh b/ct/create_lxc.sh
index 03dc1ce21..118a5302a 100644
--- a/ct/create_lxc.sh
+++ b/ct/create_lxc.sh
@@ -158,7 +158,7 @@ if [ $PCT_OSTYPE = debian ]; then
     TEMPLATE_VARIENT=bookworm
   fi
 elif [ $PCT_OSTYPE = alpine ]; then
-  TEMPLATE_VARIENT=3.18
+  TEMPLATE_VARIENT=3.20
 else
   if [ $PCT_OSVERSION = 20.04 ]; then
     TEMPLATE_VARIENT=focal
@@ -190,10 +190,11 @@ else
   pveam update >/dev/null
   msg_ok "Updated LXC Template List"
   if [ $PCT_OSTYPE = debian ]; then
-    PCT_OSTYPE=ubuntu
-    TEMPLATE_VARIENT=jammy
-    msg_error "Debian unsupported with this download method. Using Ubuntu 22.04."
+    msg_error "Debian unsupported with this download method. Exiting."
+  elif [ $PCT_OSTYPE = alpine]; then
+    $TEMPLATE_VARIENT = 3.18
   fi
+
   TEMPLATE="$(pveam available | grep -E "arm64.*$PCT_OSTYPE-$TEMPLATE_VARIENT" | sed 's/arm64[[:space:]]*//')"
 
   # Download LXC template if needed
diff --git a/misc/build.func b/misc/build.func
index c788dd2d1..259d1e3c9 100644
--- a/misc/build.func
+++ b/misc/build.func
@@ -619,8 +619,8 @@ EOF
         pct exec "$CTID" -- /bin/sh -c 'cat <<EOF >/etc/apk/repositories
 #http://dl-cdn.alpinelinux.org/alpine/latest-stable/main
 #http://dl-cdn.alpinelinux.org/alpine/latest-stable/community
-http://dl-cdn.alpinelinux.org/alpine/v3.19/main
-http://dl-cdn.alpinelinux.org/alpine/v3.19/community
+http://dl-cdn.alpinelinux.org/alpine/v3.20/main
+http://dl-cdn.alpinelinux.org/alpine/v3.20/community
 EOF'
     pct exec "$CTID" -- ash -c "apk add bash >/dev/null"
   fi