@@ -24,29 +24,37 @@ jobs:
2424
2525 if [[ ${{ github.ref }} == refs/tags* ]]; then
2626 RAW_TAG=${GITHUB_REF#refs/tags/}
27- VERSION_TAG=${RAW_TAG##*:} # This strips 'sandbox-repository:' and keeps '1.1.1'
27+ VERSION_TAG=${RAW_TAG##*:}
2828 echo ::set-output name=TAG::${VERSION_TAG}
2929 echo ::set-output name=TARGET::${{ secrets.SLACK_WEBHOOK_PROD }}
30+ REPO_NAME="${RAW_TAG%%:*}"
31+ CLEAN_TAG="${RAW_TAG#sandbox-}"
32+ TAG="${REPO_NAME}:${CLEAN_TAG}"
33+ echo "Final Docker tag: $TAG"
3034 else
3135 TAG=qa-${GITHUB_SHA::7}-$(date +%s)
3236 echo ::set-output name=TAG::${TAG}
3337 echo ::set-output name=TARGET::${{ secrets.SLACK_WEBHOOK }}
38+ REPO_NAME="${RAW_TAG%%:*}"
39+ CLEAN_TAG="${RAW_TAG#sandbox-}"
40+ TAG="${REPO_NAME}:${CLEAN_TAG}"
41+ echo "Final Docker tag: $TAG"
3442 fi
35- - name : Clean Docker Tag
36- run : |
37- RAW_TAG="sandbox-adminer-core:sandbox-1.1.3"
43+ # - name: Clean Docker Tag
44+ # run: |
45+ # RAW_TAG="sandbox-adminer-core:sandbox-1.1.3"
3846
39- REPO_NAME="${RAW_TAG%%:*}"
40- TAG_NAME="${RAW_TAG#*:}"
41- CLEAN_TAG="${TAG_NAME#sandbox-}"
47+ # REPO_NAME="${RAW_TAG%%:*}"
48+ # TAG_NAME="${RAW_TAG#*:}"
49+ # CLEAN_TAG="${TAG_NAME#sandbox-}"
4250
43- FINAL_TAG="${REPO_NAME}:${CLEAN_TAG}"
44- echo "Final Docker tag : $FINAL_TAG"
51+ # FINAL_TAG="${REPO_NAME}:${CLEAN_TAG}"
52+ # echo "Final Docker tag: $FINAL_TAG"
4553 - name : Build the Docker image
4654 env :
4755 LLC_ECR_HOST : ${{ secrets.LLC_ECR_HOST }}
4856 TAG : ${{ steps.vars.outputs.TAG }}
4957 REPOSITORY : ${{ steps.vars.outputs.REPOSITORY }}
5058 run : |
51- docker build . --file Dockerfile --tag ${LLC_ECR_HOST}/$REPOSITORY:$FINAL_TAG
52- docker push ${LLC_ECR_HOST}/$REPOSITORY:$FINAL_TAG
59+ docker build . --file Dockerfile --tag ${LLC_ECR_HOST}/$REPOSITORY:$TAG
60+ docker push ${LLC_ECR_HOST}/$REPOSITORY:$TAG
0 commit comments