From 5d51321de5fe40c4b09d000a9981a853b8f053d1 Mon Sep 17 00:00:00 2001
From: Bram Prieshof <bram@bprieshof.nl>
Date: Sat, 1 Jul 2023 18:29:33 +0200
Subject: [PATCH] All Alpine CTs: Bumped release, Bumped PHP for  Nextcloud,
 Mailbackup and  Heimdall CT

 Bumped Alpine Release from 3.17 to 3.18
 Bumped PHP Release from 8.1 to 8.2
---
 .gitignore           |  2 +
 .vscode/tasks.json   |  5 ++-
 CT-Build/Alpine.yaml | 96 ++++++++++++++++++++++----------------------
 3 files changed, 53 insertions(+), 50 deletions(-)

diff --git a/.gitignore b/.gitignore
index 867c6ae..8a29339 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,7 +2,9 @@
 *.tar.gz
 *.tar
 *.zip
+*.sh.kate-swp
 /distrobuilder
+/bin
 CT-Files/nginx/nginx_signing.rsa.pub
 CT-Files/transfersh/transfersh-linux-amd64
 CT-Files/transfersh/transfershVersion
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index 1720791..0f4d212 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -4,9 +4,10 @@
     "version": "2.0.0",
     "tasks": [
         {
+            // When ran in a Proxmox CT, expose a folder mountpoint and symlink to it MOUNTPOINT/build/template/cache and tell Proxmox this use this folder for LXC images
             "label": "BuildIMG",
             "type": "shell",
-            "command": " export XZ_DEFAULTS='-T 0'; ./distrobuilder build-lxc CT-Build/${input:Distro}.yaml  -o image.variant=${input:BuildVariant} ;rm -f meta.tar.xz; mv ./rootfs.tar.xz /build/template/cache/${input:Distro}-${input:BuildVariant}.tar.xz",
+            "command": " export XZ_DEFAULTS='-T 0'; sudo ./distrobuilder build-lxc CT-Build/${input:Distro}.yaml  -o image.variant=${input:BuildVariant} ;sudo chown $SUDO_USER:$SUDO_USER -R *.tar.xz ;rm -f meta.tar.xz; mv rootfs.tar.xz bin/${input:Distro}-${input:BuildVariant}.tar.xz",
             "problemMatcher": [],
             "group": {
                 "kind": "build",
@@ -16,7 +17,7 @@
         {
             "label": "SetupImgBuilder",
             "type": "shell",
-            "command": "git clone https://github.com/lxc/distrobuilder distrobuilderSRC; cd distrobuilderSRC; gofmt -s -w .; go build -o ../ -v ./...; cd ../; rm -rf distrobuilderSRC",
+            "command": "mkdir bin;git clone https://github.com/lxc/distrobuilder distrobuilderSRC; cd distrobuilderSRC; gofmt -s -w .; go build -o ../ -v ./...; cd ../; rm -rf distrobuilderSRC",
             "problemMatcher": [],
             "group": {
                 "kind": "build",
diff --git a/CT-Build/Alpine.yaml b/CT-Build/Alpine.yaml
index 55c5165..a3188f9 100644
--- a/CT-Build/Alpine.yaml
+++ b/CT-Build/Alpine.yaml
@@ -1,6 +1,6 @@
 image:
   distribution: "alpinelinux"
-  release: "3.17"
+  release: "3.18"
 
 source:
   downloader: alpinelinux-http
@@ -456,34 +456,34 @@ packages:
 
   #PKGS for nextcloud
   - packages:
-    - php81-pdo_mysql
-    - php81-pecl-imagick
-    - php81-cli
-    - php81-pecl-apcu
-    - php81-pecl-redis
-    - php81-fpm
-    - php81-cgi
-    - php81-common
-    - php81-mbstring
-    - php81-curl
-    - php81-gd
-    - php81-intl
-    - php81-soap
-    - php81-xml
-    - php81-zip
-    - php81-pear
-    - php81-session
-    - php81-posix
-    - php81-pdo
-    - php81-dom
-    - php81-simplexml
-    - php81-xmlreader
-    - php81-xmlwriter
-    - php81-opcache
-    - php81-pcntl
-    - php81-fileinfo
-    - php81-bcmath
-    - php81-gmp
+    - php82-pdo_mysql
+    - php82-pecl-imagick
+    - php82-cli
+    - php82-pecl-apcu
+    - php82-pecl-redis
+    - php82-fpm
+    - php82-cgi
+    - php82-common
+    - php82-mbstring
+    - php82-curl
+    - php82-gd
+    - php82-intl
+    - php82-soap
+    - php82-xml
+    - php82-zip
+    - php82-pear
+    - php82-session
+    - php82-posix
+    - php82-pdo
+    - php82-dom
+    - php82-simplexml
+    - php82-xmlreader
+    - php82-xmlwriter
+    - php82-opcache
+    - php82-pcntl
+    - php82-fileinfo
+    - php82-bcmath
+    - php82-gmp
     - libpng
     - zlib
     - imagemagick
@@ -528,12 +528,12 @@ packages:
 #PKGS for MailBackup
   - packages:
     - dovecot
-    - php81-xml
-    - php81-fpm
-    - php81-curl
-    - php81-dom
-    - php81-zip
-    - php81-mbstring
+    - php82-xml
+    - php82-fpm
+    - php82-curl
+    - php82-dom
+    - php82-zip
+    - php82-mbstring
     - php-openssl
     - py3-pip
     - sudo
@@ -571,19 +571,19 @@ packages:
 #PKGS for Heimdall
   - packages:
     - git
-    - php81
-    - php81-ctype
-    - php81-curl
-    - php81-pdo_sqlite
-    - php81-mbstring
-    - php81-json
-    - php81-zip
-    - php81-xml
-    - php81-fpm
-    - php81-session
-    - php81-openssl
-    - php81-tokenizer
-    - php81-fileinfo
+    - php82
+    - php82-ctype
+    - php82-curl
+    - php82-pdo_sqlite
+    - php82-mbstring
+    - php82-json
+    - php82-zip
+    - php82-xml
+    - php82-fpm
+    - php82-session
+    - php82-openssl
+    - php82-tokenizer
+    - php82-fileinfo
     action: install
     variants:
     - heimdall