From 717f91ce2698cd149eb9b63223cbc536398acf51 Mon Sep 17 00:00:00 2001
From: thelamer <ryankuba@gmail.com>
Date: Sun, 26 Sep 2021 07:35:54 -0700
Subject: [PATCH] rebase to Alpine 3.14

---
 .github/workflows/external_trigger.yml | 2 +-
 Jenkinsfile                            | 4 ++--
 README.md                              | 1 +
 jenkins-vars.yml                       | 4 ++--
 readme-vars.yml                        | 1 +
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml
index b045b492..9b209c29 100644
--- a/.github/workflows/external_trigger.yml
+++ b/.github/workflows/external_trigger.yml
@@ -18,7 +18,7 @@ jobs:
           fi
           echo "**** External trigger running off of master branch. To disable this trigger, set a Github secret named \"PAUSE_EXTERNAL_TRIGGER_WEBTOP_MASTER\". ****"
           echo "**** Retrieving external version ****"
-          EXT_RELEASE=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.13/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
+          EXT_RELEASE=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.14/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
             && awk '/^P:'"xfce4"'$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://')
           if [ -z "${EXT_RELEASE}" ] || [ "${EXT_RELEASE}" == "null" ]; then
             echo "**** Can't retrieve external version, exiting ****"
diff --git a/Jenkinsfile b/Jenkinsfile
index 1fc1ad72..bed02cb3 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -24,8 +24,8 @@ pipeline {
     DEV_DOCKERHUB_IMAGE = 'lsiodev/webtop'
     PR_DOCKERHUB_IMAGE = 'lspipepr/webtop'
     DIST_IMAGE = 'alpine'
-    DIST_TAG = '3.13'
-    DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.13/community/'
+    DIST_TAG = '3.14'
+    DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.14/community/'
     DIST_REPO_PACKAGES = 'xfce4'
     MULTIARCH = 'true'
     CI = 'true'
diff --git a/README.md b/README.md
index 3af27394..c66e8747 100644
--- a/README.md
+++ b/README.md
@@ -268,4 +268,5 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **26.09.21:** - Rebase to Alpine versions to 3.14.
 * **20.04.21:** - Initial release.
diff --git a/jenkins-vars.yml b/jenkins-vars.yml
index 146ba0ec..2b74aef3 100644
--- a/jenkins-vars.yml
+++ b/jenkins-vars.yml
@@ -15,8 +15,8 @@ repo_vars:
   - DEV_DOCKERHUB_IMAGE = 'lsiodev/webtop'
   - PR_DOCKERHUB_IMAGE = 'lspipepr/webtop'
   - DIST_IMAGE = 'alpine'
-  - DIST_TAG = '3.13'
-  - DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.13/community/'
+  - DIST_TAG = '3.14'
+  - DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.14/community/'
   - DIST_REPO_PACKAGES = 'xfce4'
   - MULTIARCH = 'true'
   - CI = 'true'
diff --git a/readme-vars.yml b/readme-vars.yml
index 28b85b87..43f050da 100644
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -78,4 +78,5 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "26.09.21:", desc: "Rebase to Alpine versions to 3.14." }
   - { date: "20.04.21:", desc: "Initial release." }