From cee5c9193154afa94c019551cfb7466283de6c23 Mon Sep 17 00:00:00 2001 From: Lee Calcote <lee.calcote@layer5.io> Date: Sun, 23 Aug 2020 22:00:45 -0500 Subject: [PATCH] Update ci.yml --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 53c05ae6..4434a3da 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -116,7 +116,7 @@ jobs: docker: name: Docker build and push runs-on: ubuntu-latest - # needs: [build, build_release] + #needs: [build_release] steps: - name: Check out code if: github.event_name != 'pull_request' && startsWith(github.ref, 'refs/tags/') && success() @@ -125,14 +125,14 @@ jobs: fetch-depth: 1 - name: Docker login if: github.event_name != 'pull_request' && startsWith(github.ref, 'refs/tags/') && success() - uses: azure/container-actions/docker-login@master + uses: azure/docker-login@v1 with: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} - name: Docker build & tag if: github.event_name != 'pull_request' && startsWith(github.ref, 'refs/tags/') && success() run: | - DOCKER_BUILDKIT=1 docker build --no-cache -t ${{ secrets.IMAGE_NAME }}:stable-latest . + DOCKER_BUILDKIT=1 docker build --no-cache -t ${{ secrets.IMAGE_NAME }}:stable-latest --build-arg TOKEN=${{ secrets.GLOBAL_TOKEN }} --build-arg GIT_COMMITSHA=${GITHUB_SHA::7} --build-arg GIT_VERSION=${GITHUB_REF/refs\/tags\//} . docker tag ${{ secrets.IMAGE_NAME }}:stable-latest ${{ secrets.IMAGE_NAME }}:stable-${GITHUB_REF/refs\/tags\//} docker tag ${{ secrets.IMAGE_NAME }}:stable-latest ${{ secrets.IMAGE_NAME }}:stable-${GITHUB_SHA::7} - name: Docker push