Update CI-e2e.yml

justinmerrell · justinmerrell · commit 3b807bf4851f · 2023-08-14T11:04:23.000-04:00
diff --git a/.github/workflows/CI-e2e.yml b/.github/workflows/CI-e2e.yml
@@ -38,13 +38,20 @@ jobs:
 
       - name: Define Docker Tag
         id: docker_tag
-        run: echo "DOCKER_TAG=${{ github.sha }}".substring(0, 7) >> $GITHUB_ENV
+        run: echo "DOCKER_TAG=$(echo ${{ github.sha }} | cut -c 1-7)" >> $GITHUB_ENV
+
+      - name: Set Docker Tag as Output
+        id: output_docker_tag
+        run: echo "::set-output name=docker_tag::${{ env.DOCKER_TAG }}"
 
       - name: Build and push Docker image
+        env:
+          DOCKERHUB_REPO: ${{ secrets.DOCKERHUB_REPO }}
+          DOCKERHUB_IMG: ${{ secrets.DOCKERHUB_IMG }}
         run: |
           docker login -u ${{ secrets.DOCKERHUB_USERNAME }} -p ${{ secrets.DOCKERHUB_TOKEN }}
-          docker build -t ${{ vars.DOCKERHUB_REPO }}/${{ vars.DOCKERHUB_IMG }}:${{ env.DOCKER_TAG }} -f mock-worker/Dockerfile mock-worker
-          docker push ${{ vars.DOCKERHUB_REPO }}/${{ vars.DOCKERHUB_IMG }}:${{ env.DOCKER_TAG }}
+          docker build -t $DOCKERHUB_REPO/$DOCKERHUB_IMG:${{ env.DOCKER_TAG }} -f mock-worker/Dockerfile mock-worker
+          docker push $DOCKERHUB_REPO/$DOCKERHUB_IMG:${{ env.DOCKER_TAG }}
 
   test:
     name: Run End-to-End Tests
