diff --git a/.github/workflows/release-quickstart.yml b/.github/workflows/release-quickstart.yml index dec4e3804..2edf3fdb4 100644 --- a/.github/workflows/release-quickstart.yml +++ b/.github/workflows/release-quickstart.yml @@ -12,14 +12,15 @@ on: jobs: release-quickstart: name: Release Quickstart Job - # this is only run on the official upstream repo when a PR is merged to the default branch "main" or a release tag - # is pushed; merges to main trigger a quickstart release with a commit SHA suffix featuring the previous ziti binary - # release version, whereas release tag pushes trigger a quickstart release with the same tag name and the same ziti - # binary release version - if: github.repository_owner == 'openziti' - && ( - startsWith(github.ref_name, 'v') - || ( + # this is only run on the official upstream repo when a PR is merged to the + # default branch "main" or a release tag is pushed or for the same + # conditions in a repo fork that overrides the container image repo to push + # to; merges to main trigger a quickstart release with a commit SHA suffix + # featuring the previous ziti binary release version, whereas release tag + # pushes trigger a quickstart release with the same tag name and the same + # ziti binary release version + if: (github.repository_owner == 'openziti' || github.vars.ZITI_QUICKSTART_IMAGE != '') && ( + startsWith(github.ref_name, 'v') || ( github.event.pull_request.merged == true && contains(github.event.pull_request.labels.*.name, 'quickstartrelease') ) diff --git a/quickstart/docker/pushLatestDocker.sh b/quickstart/docker/pushLatestDocker.sh index 557fc26a5..a1ef148b0 100755 --- a/quickstart/docker/pushLatestDocker.sh +++ b/quickstart/docker/pushLatestDocker.sh @@ -2,6 +2,7 @@ set -eo pipefail SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )" +: "${ZITI_QUICKSTART_IMAGE:-openziti/quickstart}" if [ -z "${ZITI_VERSION}" ]; then DOCKER_IMAGE_ROOT="$(realpath ${SCRIPT_DIR}/image)" @@ -36,6 +37,6 @@ docker buildx create \ eval docker buildx build "${_BUILDX_PLATFORM}" "${SCRIPT_DIR}/image" \ --build-arg ZITI_VERSION_OVERRIDE="v${ZITI_VERSION}" \ - --tag "openziti/quickstart:${ZITI_VERSION}" \ - --tag "openziti/quickstart:${IMAGE_TAG}" \ + --tag "${ZITI_QUICKSTART_IMAGE}:${ZITI_VERSION}" \ + --tag "${ZITI_QUICKSTART_IMAGE}:${IMAGE_TAG}" \ "${_BUILDX_ACTION}"