From b5183b3bca2cd1e0cc4e0f938dd5146c08f97ec2 Mon Sep 17 00:00:00 2001
From: Alf <alf.g.jr@gmail.com>
Date: Tue, 26 Jul 2022 21:10:10 -0700
Subject: [PATCH] updating workflows

---
 .github/workflows/docker.yml  | 52 +++++++++++++++++++++++++++++------
 .github/workflows/release.yml |  2 --
 2 files changed, 44 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 7503056..423b204 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -5,14 +5,50 @@ on:
     tags:
       - '*'
 
+env:
+  REGISTRY: ghcr.io
+  IMAGE_NAME: ${{ github.repository }}
+
 jobs:
-  build:
+  build-and-push-image:
     runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+
     steps:
-    - uses: actions/checkout@master
-    - name: Build the Docker image
-      run: |
-        docker login ghcr.io --username $GITHUB_ACTOR --password ${{ secrets.GITHUB_TOKEN }}
-        docker build . --file Dockerfile --tag ghcr.io/alfg/ffmpegd:${GITHUB_REF/refs\/tags\//} --tag ghcr.io/alfg/ffmpegd:latest
-        docker push ghcr.io/alfg/ffmpegd:${GITHUB_REF/refs\/tags\//}
-        docker push ghcr.io/alfg/ffmpegd:latest
\ No newline at end of file
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      - name: Log in to the Container registry
+        uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
+        with:
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+
+      - name: Build and push Docker image
+        uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
+        with:
+          context: .
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+
+# jobs:
+#   build:
+#     runs-on: ubuntu-latest
+#     steps:
+#     - uses: actions/checkout@master
+#     - name: Build the Docker image
+#       run: |
+#         docker login ghcr.io --username $GITHUB_ACTOR --password ${{ secrets.GITHUB_TOKEN }}
+#         docker build . --file Dockerfile --tag ghcr.io/alfg/ffmpegd:${GITHUB_REF/refs\/tags\//} --tag ghcr.io/alfg/ffmpegd:latest
+#         docker push ghcr.io/alfg/ffmpegd:${GITHUB_REF/refs\/tags\//}
+#         docker push ghcr.io/alfg/ffmpegd:latest
\ No newline at end of file
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index f76f269..20ff554 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -17,8 +17,6 @@ jobs:
       -
         name: Set up Go
         uses: actions/setup-go@v3
-        with:
-          go-version: 1.16
       -
         name: Run GoReleaser
         uses: goreleaser/goreleaser-action@v3