From 409377d014189badf1c11c553bb9c087ae282f9e Mon Sep 17 00:00:00 2001
From: Ilya Sosnovsky <ilya.sosnovsky@flant.com>
Date: Tue, 9 Mar 2021 18:28:56 +0300
Subject: [PATCH] change action syntax

---
 .github/workflows/publish-latest.yaml | 25 +++++++++++--------------
 .github/workflows/publish-tag.yaml    | 26 +++++++++++---------------
 2 files changed, 22 insertions(+), 29 deletions(-)

diff --git a/.github/workflows/publish-latest.yaml b/.github/workflows/publish-latest.yaml
index 6602bac..e2e5710 100644
--- a/.github/workflows/publish-latest.yaml
+++ b/.github/workflows/publish-latest.yaml
@@ -5,29 +5,26 @@ on:
     
 jobs:
   build:
-    name: Converge
+    name: build latest images for relase
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
         uses: actions/checkout@v2
         with:
           fetch-depth: 0
-      - name: Docker login
-        uses: docker/login-action@v1
-        with:
-          username: ${{ secrets.DOCKER_USER }}
-          password: ${{ secrets.DOCKER_PASS }}
       - name: Push openvpn image to Docker Hub
         uses: docker/build-push-action@v1
         with:
-          tags: flant/openvpn-admin:openvpn-latest
-          context: .
-          file:  Dockerfile.openvpn
-          push: true
+          username: ${{ secrets.DOCKER_USER }}
+          password: ${{ secrets.DOCKER_PASS }}
+          repository: flant/openvpn-admin
+          tags: openvpn-latest
+          dockerfile:  Dockerfile.openvpn
       - name: Push openvpn-admin image to Docker Hub
         uses: docker/build-push-action@v1
         with:
-          tags: flant/openvpn-admin:latest
-          file: Dockerfile
-          context: .
-          push: true
+          username: ${{ secrets.DOCKER_USER }}
+          password: ${{ secrets.DOCKER_PASS }}
+          repository: flant/openvpn-admin
+          tags: latest
+          dockerfile: Dockerfile
diff --git a/.github/workflows/publish-tag.yaml b/.github/workflows/publish-tag.yaml
index b885fc0..ba51323 100644
--- a/.github/workflows/publish-tag.yaml
+++ b/.github/workflows/publish-tag.yaml
@@ -6,33 +6,29 @@ on:
     
 jobs:
   build:
-    name: Converge
+    name: build images for tag
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
         uses: actions/checkout@v2
         with:
           fetch-depth: 0
-      - name: Docker login
-        uses: docker/login-action@v1
-        with:
-          username: ${{ secrets.DOCKER_USER }}
-          password: ${{ secrets.DOCKER_PASS }}
       - name: Get the version
         id: get_version
         run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\//}
       - name: Push openvpn image to Docker Hub
         uses: docker/build-push-action@v1
         with:
-          tags: flant/openvpn-admin:openvpn-${{ steps.get_version.outputs.VERSION }}
-          context: .
-          file:  Dockerfile.openvpn
-          push: true
+          username: ${{ secrets.DOCKER_USER }}
+          password: ${{ secrets.DOCKER_PASS }}
+          repository: flant/openvpn-admin
+          tags: openvpn-${{ steps.get_version.outputs.VERSION }}
+          dockerfile:  Dockerfile.openvpn
       - name: Push openvpn-admin image to Docker Hub
         uses: docker/build-push-action@v1
         with:
-          tags: flant/openvpn-admin:${{ steps.get_version.outputs.VERSION }}
-          file: Dockerfile
-          context: .
-          push: true
-
+          username: ${{ secrets.DOCKER_USER }}
+          password: ${{ secrets.DOCKER_PASS }}
+          repository: flant/openvpn-admin
+          tags: ${{ steps.get_version.outputs.VERSION }}
+          dockerfile: Dockerfile