diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8262647263..985e76b556 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -30,6 +30,12 @@ on: required: false default: false type: boolean + container-ref-override: + description: | + GHCR ref of the container to use. + required: false + default: 'latest' + type: string env: CI: true @@ -151,9 +157,9 @@ jobs: run: | cd buildroot if [ "${{inputs.force-own-container}}" = "true" ] ; then - imgname=$(./opentrons-build-container.sh build) + imgname=$(./opentrons-build-container.sh build "${{inputs.container-ref-override}}") else - imgname=$(./opentrons-build-container.sh pull || ./opentrons-build-container.sh build) + imgname=$(./opentrons-build-container.sh pull "${{inputs.container-ref-override}}" || ./opentrons-build-container.sh build "${{inputs.container-ref-override}}") fi echo "image-name=$imgname" >> $GITHUB_OUTPUT diff --git a/opentrons-build-container.sh b/opentrons-build-container.sh index d447303ba8..f7d6c2fb64 100755 --- a/opentrons-build-container.sh +++ b/opentrons-build-container.sh @@ -32,19 +32,21 @@ EOF exit 1 } +imgref=${2:-latest} + build () { - docker build ${filter_arg} -t ${imgname}:${imgtag} -t ${imgname}:latest . 1>&2 || exit 1 + docker build ${filter_arg} -t ${imgname}:${imgtag} -t ${imgname}:${imgref} . 1>&2 || exit 1 echo ${imgname}:${imgtag} } push () { - docker push ${imgname}:latest 1>&2 || exit 1 - echo ${imgname}:latest + docker push ${imgname}:${imgref} 1>&2 || exit 1 + echo ${imgname}:${imgref} } pull () { - docker pull ${imgname}:latest 1>&2 || exit 1 - echo ${imgname}:latest + docker pull ${imgname}:${imgref} 1>&2 || exit 1 + echo ${imgname}:${imgref} }