rebase to alpine 3.14

This commit is contained in:
thelamer 2021-09-26 08:03:11 -07:00
parent d0f2b4dea4
commit eed4a88981
3 changed files with 5 additions and 5 deletions

View File

@ -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 ****"

4
Jenkinsfile vendored
View File

@ -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'

View File

@ -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'