From de596e3a51b7c95e4cfb320d019166f0d1655da8 Mon Sep 17 00:00:00 2001 From: aptalca Date: Thu, 1 Jul 2021 11:42:27 -0400 Subject: [PATCH] update versioning and trigger --- .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 968c7d1..f70ff47 100755 --- 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_NGINX_MASTER\". ****" echo "**** Retrieving external version ****" - EXT_RELEASE=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.13/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \ + EXT_RELEASE=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.14/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \ && awk '/^P:'"nginx"'$/,/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 f1582cc..c81574a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -24,8 +24,8 @@ pipeline { DEV_DOCKERHUB_IMAGE = 'lsiodev/nginx' PR_DOCKERHUB_IMAGE = 'lspipepr/nginx' DIST_IMAGE = 'alpine' - DIST_TAG = '3.13' - DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.13/main/' + DIST_TAG = '3.14' + DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.14/main/' DIST_REPO_PACKAGES = 'nginx' MULTIARCH='true' CI='true' diff --git a/jenkins-vars.yml b/jenkins-vars.yml index 19f3a19..a741533 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -15,8 +15,8 @@ repo_vars: - DEV_DOCKERHUB_IMAGE = 'lsiodev/nginx' - PR_DOCKERHUB_IMAGE = 'lspipepr/nginx' - DIST_IMAGE = 'alpine' - - DIST_TAG = '3.13' - - DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.13/main/' + - DIST_TAG = '3.14' + - DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.14/main/' - DIST_REPO_PACKAGES = 'nginx' - MULTIARCH='true' - CI='true'