fix

arillso · Jan 25, 2024 · 9845982 · 9845982
1 parent 4ebb0ce
commit 9845982
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -26,7 +26,7 @@ jobs:
         env:
           DOCKER_BUILDKIT: 1
         run: |
-          ansible-builder build -v3 --tag=ghcr.io/arillso/kubernetes:${{ github.sha }} --tag=arillso/kubernetes:${{ github.sha }} --container-runtime=docker
+          ansible-builder build -v3 --tag=ghcr.io/arillso/kubernetes:latest --tag=arillso/kubernetes:latest --container-runtime=docker
 
       - name: Login to DockerHub
         uses: docker/login-action@v3

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -17,11 +17,14 @@ jobs:
           python -m pip install --upgrade pip
           pip install ansible-builder
 
+      - name: Set branch name environment variable
+        run: echo "BRANCH_NAME=$(echo ${GITHUB_REF#refs/heads/} | sed 's/\//-/g')" >> $GITHUB_ENV
+
       - name: Build EE with Docker
         env:
           DOCKER_BUILDKIT: 1
         run: |
-          ansible-builder build -v3 --tag=ghcr.io/arillso/kubernetes:${{ github.sha }} --tag=arillso/kubernetes:${{ github.sha }} --container-runtime=docker
+          ansible-builder build -v3 --tag=ghcr.io/arillso/kubernetes:${{ env.BRANCH_NAME  }} --tag=arillso/kubernetes:${{ env.BRANCH_NAME  }} --container-runtime=docker
 
       - name: Login to DockerHub
         uses: docker/login-action@v3
@@ -38,5 +41,5 @@ jobs:
 
       - name: Push
         run: |
-          docker push ghcr.io/arillso/kubernetes:${{ github.sha }}
-          docker push arillso/kubernetes:${{ github.sha }}
+          docker push ghcr.io/arillso/kubernetes:${{ env.BRANCH_NAME  }}
+          docker push arillso/kubernetes:${{ env.BRANCH_NAME  }}