From e8a551b75cb01705b470336fa47e3c5b3c512b4d Mon Sep 17 00:00:00 2001
From: Jason Dove <1695733+jasongdove@users.noreply.github.com>
Date: Sat, 23 May 2026 13:55:57 -0500
Subject: [PATCH 1/2] fix: more version alignment

---
 .github/workflows/ci.yml | 18 ++++--------------
 docker/Dockerfile        |  2 ++
 2 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 32e67e8..2879773 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -12,24 +12,14 @@ jobs:
       - uses: actions/checkout@v6
         with:
           fetch-depth: 0
-      - name: Extract Docker Tag
+      - name: Extract Versions
         shell: bash
         run: |
           tag=$(git describe --tags --abbrev=0)
-          tag2="${tag:1}"
           short=$(git rev-parse --short HEAD)
-          final="${tag2}-${short}"
-          echo "git_tag=${final}" >> $GITHUB_ENV
-      - name: Extract Artifacts Version
-        shell: bash
-        run: |
-          tag=$(git describe --tags --abbrev=0)
-          short=$(git rev-parse --short HEAD)
-          final="${tag}-${short}"
-          echo "artifacts_version=${final}" >> $GITHUB_ENV
-          echo "info_version=${tag:1}" >> $GITHUB_ENV
+          echo "artifacts_version=${tag}-${short}" >> $GITHUB_ENV
+          echo "info_version=${tag:1}-${short}" >> $GITHUB_ENV
     outputs:
-      git_tag: ${{ env.git_tag }}
       artifacts_version: ${{ env.artifacts_version }}
       info_version: ${{ env.info_version }}
 
@@ -57,7 +47,7 @@ jobs:
     needs: calculate_version
     with:
       base_version: develop
-      info_version: ${{ needs.calculate_version.outputs.git_tag }}
+      info_version: ${{ needs.calculate_version.outputs.info_version }}
       tag_version: ${{ github.sha }}
     secrets:
       docker_hub_username: ${{ secrets.DOCKER_HUB_USERNAME }}
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 7be35ca..3397b49 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -7,6 +7,8 @@ COPY . .
 RUN cargo chef prepare --recipe-path recipe.json
 
 FROM chef AS build
+ARG INFO_VERSION
+ENV ETV_VERSION=${INFO_VERSION}
 COPY --from=planner /build/recipe.json recipe.json
 RUN cargo chef cook --release --recipe-path recipe.json
 COPY . .

From 63daf5ecf6ce732e3cd457cce293b1ee4d05e575 Mon Sep 17 00:00:00 2001
From: Jason Dove <1695733+jasongdove@users.noreply.github.com>
Date: Sat, 23 May 2026 13:57:54 -0500
Subject: [PATCH 2/2] feedback

---
 docker/Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 3397b49..93e8b7f 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -7,10 +7,10 @@ COPY . .
 RUN cargo chef prepare --recipe-path recipe.json
 
 FROM chef AS build
-ARG INFO_VERSION
-ENV ETV_VERSION=${INFO_VERSION}
 COPY --from=planner /build/recipe.json recipe.json
 RUN cargo chef cook --release --recipe-path recipe.json
+ARG INFO_VERSION
+ENV ETV_VERSION=${INFO_VERSION}
 COPY . .
 RUN cargo build --release