pr suggestions

coder · matifali · Jan 18, 2024 · Jan 10, 2024 · Jan 10, 2024 · Jan 10, 2024
commit e48d0c9b2a2fe8eb09589aa80dabf4aa33ca1758
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -705,6 +705,7 @@ jobs:
         id: build-docker
         env:
           CODER_IMAGE_BASE: ghcr.io/coder/coder-preview
+          CODER_IMAGE_TAG_PREFIX: main
           DOCKER_CLI_EXPERIMENTAL: "enabled"
         run: |
           set -euxo pipefail
@@ -730,6 +731,13 @@ jobs:
               --version $version \
               $(cat build/coder_"$version"_linux_{amd64,arm64,armv7}.tag)
 
+            # Create and push a multi-arch manifest for the main tag
+            ./scripts/build_docker_multiarch.sh \
+              --push \
+              --target "ghcr.io/coder/coder-preview:main" \
+              --version $version \
+              $(cat build/coder_"$version"_linux_{amd64,arm64,armv7}.tag)
+
             # Create and push a multi-arch manifest for the latest tag
             ./scripts/build_docker_multiarch.sh \
               --push \

diff --git a/scripts/image_tag.sh b/scripts/image_tag.sh
@@ -50,10 +50,16 @@ if [[ "$version" == "" ]]; then
 fi
 
 image="${CODER_IMAGE_BASE:-ghcr.io/coder/coder}"
-tag="v$version"
+
+# use CODER_IMAGE_TAG_PREFIX if set as a prefix for the tag
+tag_prefix="${CODER_IMAGE_TAG_PREFIX:-}"
+
+tag="${tag_prefix:+$tag_prefix-}v$version"
+
 if [[ "$version" == "latest" ]]; then
 	tag="latest"
 fi
+
 if [[ "$arch" != "" ]]; then
 	tag+="-$arch"
 fi