From 442dac7b54ebe38aa6068db4a7394e6dae214e66 Mon Sep 17 00:00:00 2001 From: aptalca Date: Thu, 16 Sep 2021 13:08:53 -0400 Subject: [PATCH] update changelog --- Jenkinsfile | 15 ++++++++++----- README.md | 1 + readme-vars.yml | 2 +- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 3f2abd2..1e361b9 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -375,7 +375,9 @@ pipeline { // Build Docker container for push to LS Repo stage('Build-Single') { when { - environment name: 'MULTIARCH', value: 'false' + expression { + env.MULTIARCH == 'false' || params.PACKAGE_CHECK == 'true' + } environment name: 'EXIT_STATUS', value: '' } steps { @@ -400,7 +402,10 @@ pipeline { // Build MultiArch Docker containers for push to LS Repo stage('Build-Multi') { when { - environment name: 'MULTIARCH', value: 'true' + allOf { + environment name: 'MULTIARCH', value: 'true' + expression { params.PACKAGE_CHECK == 'false' } + } environment name: 'EXIT_STATUS', value: '' } parallel { @@ -505,7 +510,7 @@ pipeline { sh '''#! /bin/bash set -e TEMPDIR=$(mktemp -d) - if [ "${MULTIARCH}" == "true" ]; then + if [ "${MULTIARCH}" == "true" ] && [ "${PACKAGE_CHECK}" == "false" ]; then LOCAL_CONTAINER=${IMAGE}:amd64-${META_TAG} else LOCAL_CONTAINER=${IMAGE}:${META_TAG} @@ -566,7 +571,7 @@ pipeline { steps { sh '''#! /bin/bash echo "Packages were updated. Cleaning up the image and exiting." - if [ "${MULTIARCH}" == "true" ]; then + if [ "${MULTIARCH}" == "true" ] && [ "${PACKAGE_CHECK}" == "false" ]; then docker rmi ${IMAGE}:amd64-${META_TAG} else docker rmi ${IMAGE}:${META_TAG} @@ -590,7 +595,7 @@ pipeline { steps { sh '''#! /bin/bash echo "There are no package updates. Cleaning up the image and exiting." - if [ "${MULTIARCH}" == "true" ]; then + if [ "${MULTIARCH}" == "true" ] && [ "${PACKAGE_CHECK}" == "false" ]; then docker rmi ${IMAGE}:amd64-${META_TAG} else docker rmi ${IMAGE}:${META_TAG} diff --git a/README.md b/README.md index c20df5d..2fd914c 100644 --- a/README.md +++ b/README.md @@ -260,6 +260,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **16.09.21:** - Fix slow `chown` on large workspace (contents of workspace folder no longer chowned). * **11.07.21:** - Bump node to 14 to fix builds * **08.05.21:** - Fix doc link * **04.02.20:** - Allow setting gui password via hash using env var `HASHED_PASSWORD`. diff --git a/readme-vars.yml b/readme-vars.yml index 01068cf..2fea39f 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -75,8 +75,8 @@ app_setup_block: | # changelog changelogs: + - { date: "16.09.21:", desc: "Fix slow `chown` on large workspace (contents of workspace folder no longer chowned)." } - { date: "11.07.21:", desc: "Bump node to 14 to fix builds" } - - { date: "05.07.21:", desc: "Fix slow `chown` on large workspace" } - { date: "08.05.21:", desc: "Fix doc link" } - { date: "04.02.20:", desc: "Allow setting gui password via hash using env var `HASHED_PASSWORD`." } - { date: "23.12.20:", desc: "Allow setting sudo password via hash using env var `SUDO_PASSWORD_HASH`." }