From 71cba6d2befd732628103b8e5f6829688e83a8a4 Mon Sep 17 00:00:00 2001
From: glihm <dev@glihm.net>
Date: Sun, 29 Sep 2024 22:40:29 -0600
Subject: [PATCH] ci: adjust dojo version to be used for dojoup

---
 .github/workflows/devcontainer.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/devcontainer.yml b/.github/workflows/devcontainer.yml
index e66c3568f0..5d00545ed2 100644
--- a/.github/workflows/devcontainer.yml
+++ b/.github/workflows/devcontainer.yml
@@ -43,6 +43,7 @@ jobs:
         if: github.event_name == 'release'
         run: |
           echo "DOCKER_TAG=${{ github.event.release.tag_name }}" >> $GITHUB_ENV
+          echo "DOJO_VERSION=${{ github.event.release.tag_name }}" >> $GITHUB_ENV
           echo "tag_name=$DOCKER_TAG" >> $GITHUB_OUTPUT
 
       - name: Set Docker tag for push event
@@ -50,12 +51,13 @@ jobs:
         run: |
           SHORT_SHA=$(echo "${{ github.sha }}" | cut -c 1-7)
           echo "DOCKER_TAG=$SHORT_SHA" >> $GITHUB_ENV
+          echo "DOJO_VERSION=$SHORT_SHA" >> $GITHUB_OUTPUT
 
       - name: Set Docker tag for workflow_dispatch event
         if: github.event_name == 'workflow_dispatch'
         run: |
           SHORT_SHA=$(echo "${{ github.sha }}" | cut -c 1-7)
-          echo "tag_name=$SHORT_SHA" >> $GITHUB_OUTPUT
+          echo "DOJO_VERSION=$SHORT_SHA" >> $GITHUB_OUTPUT
           echo "DOCKER_TAG=${{ inputs.docker_tag }}" >> $GITHUB_ENV
 
       - name: Set outputs
@@ -72,7 +74,7 @@ jobs:
           build-args: |
             VARIANT=bookworm
             BUILD_TYPE=${{ github.event_name }}
-            DOJO_VERSION=${{ github.event.release.tag_name }}
+            DOJO_VERSION=${{ env.DOJO_VERSION }}
           platforms: linux/amd64,linux/arm64
           cache-from: type=registry,ref=ghcr.io/${{ github.repository }}-dev:latest