diff options
| -rw-r--r-- | .github/workflows/main.yml | 21 | ||||
| -rw-r--r-- | Makefile | 1 | ||||
| -rw-r--r-- | Makefile.version | 1 |
3 files changed, 8 insertions, 15 deletions
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9b5fd7c..5874e59 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -18,14 +18,16 @@ jobs: run: | make envout >> ${GITHUB_ENV} - - name: show env debug - run: | - echo $VERSION - - name: Prepare system run: | make prepare + - name: Login Docker + uses: docker/login-action@v1 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_PASSWORD }} + - name: Build Docker image run: | make build @@ -36,14 +38,5 @@ jobs: - name: Push tag run: | - rm -f $HOME/.docker/config.json - docker login --username=${{secrets.DOCKERHUB_USERNAME}} --password=${{secrets.DOCKERHUB_PASSWORD}} docker.io - docker push silvio/docker-languagetool:latest - docker push silvio/docker-languagetool:${{ env.VERSION }} - - - name: Logout Docker - if: ${{ always() }} - run: | - docker logout - rm -f $HOME/.docker/config.json + make tag @@ -54,7 +54,6 @@ test-cleanup.%: tag: tag-push .PHONY: tag-push -tag-push: build tag-push: docker push silvio/docker-languagetool:latest docker push silvio/docker-languagetool:$(VERSION) diff --git a/Makefile.version b/Makefile.version index 915cb39..f3be941 100644 --- a/Makefile.version +++ b/Makefile.version @@ -3,3 +3,4 @@ BUILDARG_VERSION := --build-arg VERSION=$(VERSION) envout: @echo "VERSION=$(VERSION)" + @echo "BUILDARG_VERSION=$(BUILDARG_VERSION)" |