attempt 3 fix docker build

drolx · Oct 3, 2024 · a316e3b · a316e3b
1 parent 870095b
commit a316e3b
Showing 1 changed file with 11 additions and 7 deletions.
diff --git a/.github/workflows/deploy-containers.yml b/.github/workflows/deploy-containers.yml
@@ -74,19 +74,23 @@ jobs:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Set environment DOCKERHUB_IMAGE_TAGS and VERSION
+      
+      - name: Set VERSION
         run: |
           _TAG="${{ github.ref_name }}"
           _VERSION=${_BRANCH#v*}
-          echo "VERSION=$_VERSION" >> $GITHUB_ENV
           _MAJOR_VERSION=${_VERSION%.*}
-          _DOCKERHUB_IMAGE_TAGS="$DOCKERHUB_REPOSITORY:$_VERSION-${{ matrix.os }}"
-          _DOCKERHUB_IMAGE_TAGS+=",$DOCKERHUB_REPOSITORY:$_MAJOR_VERSION-${{ matrix.os }}"
+          echo "VERSION=$_VERSION" >> $GITHUB_ENV
+          echo "MAJOR_VERSION=$_MAJOR_VERSION" >> $GITHUB_ENV
+
+      - name: Set environment DOCKERHUB_IMAGE_TAGS
+        run: |
+          _DOCKERHUB_IMAGE_TAGS="$DOCKERHUB_REPOSITORY:$VERSION-${{ matrix.os }}"
+          _DOCKERHUB_IMAGE_TAGS+=",$DOCKERHUB_REPOSITORY:$MAJOR_VERSION-${{ matrix.os }}"
           _DOCKERHUB_IMAGE_TAGS+=",$DOCKERHUB_REPOSITORY:${{ matrix.os }}"
           if [ "${{ matrix.os }}" == "alpine" ]; then
-            _DOCKERHUB_IMAGE_TAGS+=",$DOCKERHUB_REPOSITORY:$_VERSION"
-            _DOCKERHUB_IMAGE_TAGS+=",$DOCKERHUB_REPOSITORY:$_MAJOR_VERSION"
+            _DOCKERHUB_IMAGE_TAGS+=",$DOCKERHUB_REPOSITORY:$VERSION"
+            _DOCKERHUB_IMAGE_TAGS+=",$DOCKERHUB_REPOSITORY:$MAJOR_VERSION"
             _DOCKERHUB_IMAGE_TAGS+=",$DOCKERHUB_REPOSITORY:latest"
           fi
           echo "DOCKERHUB_IMAGE_TAGS=$_DOCKERHUB_IMAGE_TAGS" >> $GITHUB_ENV