rebase to Alpine 3.14

This commit is contained in:
thelamer 2021-09-26 07:35:54 -07:00
parent 889e2a0a8a
commit 717f91ce26
5 changed files with 7 additions and 5 deletions

View File

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

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 = 'xfce4'
MULTIARCH = 'true'
CI = 'true'

View File

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

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 = 'xfce4'
- MULTIARCH = 'true'
- CI = 'true'

View File

@ -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." }