From c4ad9b45d08b77a9d7b41e8c2aa4281fedeb1270 Mon Sep 17 00:00:00 2001 From: Rob Bradford Date: Sun, 7 Apr 2024 09:36:10 +0100 Subject: [PATCH] build: Use explicit date version number for dev container This removes the requirement to ensure that we land PRs that update the Dockerfile (and the appropraite dev_cli.sh change) in a specific time frame. Signed-off-by: Rob Bradford --- .github/workflows/docker-image.yaml | 2 +- scripts/dev_cli.sh | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/docker-image.yaml b/.github/workflows/docker-image.yaml index 366cace2f..f7f9e5cca 100644 --- a/.github/workflows/docker-image.yaml +++ b/.github/workflows/docker-image.yaml @@ -41,7 +41,7 @@ jobs: images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} # generate Docker tags based on the following events/attributes tags: | - type=raw,value={{date 'YYYYMMDD'}}-0 + type=raw,value=20240407-0 type=sha - name: Build and push diff --git a/scripts/dev_cli.sh b/scripts/dev_cli.sh index 233b7246c..439b64ece 100755 --- a/scripts/dev_cli.sh +++ b/scripts/dev_cli.sh @@ -7,6 +7,8 @@ CLI_NAME="Cloud Hypervisor" CTR_IMAGE_TAG="ghcr.io/cloud-hypervisor/cloud-hypervisor" + +# Needs to match explicit version in docker-image.yaml workflow CTR_IMAGE_VERSION="20240407-0" : "${CTR_IMAGE:=${CTR_IMAGE_TAG}:${CTR_IMAGE_VERSION}}"