From eed4a889815e43a2b8d578bd72749a02152efb3d Mon Sep 17 00:00:00 2001 From: thelamer Date: Sun, 26 Sep 2021 08:03:11 -0700 Subject: [PATCH] rebase to alpine 3.14 --- .github/workflows/external_trigger.yml | 2 +- Jenkinsfile | 4 ++-- jenkins-vars.yml | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml index c0996088..5e10a9b2 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 alpine-i3 branch. To disable this trigger, set a Github secret named \"PAUSE_EXTERNAL_TRIGGER_WEBTOP_ALPINE_I3\". ****" 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:'"i3wm"'$/,/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 67e0ed16..712d8ab6 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 = 'i3wm' MULTIARCH = 'true' CI = 'true' diff --git a/jenkins-vars.yml b/jenkins-vars.yml index 848bff14..b6b7d566 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 = 'i3wm' - MULTIARCH = 'true' - CI = 'true'