From 74d4245e8b88afc5f069001bd2f875cfe253d710 Mon Sep 17 00:00:00 2001
From: Silvio Fricke
Date: Wed, 19 May 2021 13:58:41 +0200
Subject: github: rework a bit

Signed-off-by: Silvio Fricke <silvio.fricke@gmail.com>
---
 .github/workflows/main.yml | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

(limited to '.github/workflows/main.yml')

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
 
-- 
cgit v1.2.3