From 287f86566a99d49f2b7b93420234642916843861 Mon Sep 17 00:00:00 2001
From: Adrian <1664229+azun@users.noreply.github.com>
Date: Thu, 3 Aug 2023 16:14:23 +0300
Subject: [PATCH] Fixed docker image publish job (#7)

* Fixed image build and publish
* Disabled multi-arch image testing
---
 .github/workflows/docker-image-push.yml    | 15 +++++++--------
 .github/workflows/staging-image-tester.yml |  2 +-
 Dockerfile                                 |  1 +
 charts/external-dns/Chart.yaml             |  4 ++--
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/docker-image-push.yml b/.github/workflows/docker-image-push.yml
index 9f2ce89f15..2b4838333b 100644
--- a/.github/workflows/docker-image-push.yml
+++ b/.github/workflows/docker-image-push.yml
@@ -27,11 +27,11 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v2
 
-      - name: Set up Go
-        uses: actions/setup-go@v2
-        with:
-          go-version: 1.17
-        id: go
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
 
       # Login against a Docker registry except on PR
       # https://github.com/docker/login-action
@@ -59,11 +59,10 @@ jobs:
       # Build and push Docker image with Buildx (don't push on PR)
       # https://github.com/docker/build-push-action
       - name: Build and push Docker image
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v4
         with:
           context: .
-          build-args: |
-            ARCH=amd64
+          platforms: linux/amd64,linux/arm64
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
diff --git a/.github/workflows/staging-image-tester.yml b/.github/workflows/staging-image-tester.yml
index 30c5eda9f1..bf70ed3776 100644
--- a/.github/workflows/staging-image-tester.yml
+++ b/.github/workflows/staging-image-tester.yml
@@ -34,4 +34,4 @@ jobs:
         go get -v -t -d ./...
 
     - name: Test
-      run: make build.image/multiarch
+      run: make build.image
diff --git a/Dockerfile b/Dockerfile
index 341df57028..0681ec4792 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -24,6 +24,7 @@ COPY go.sum .
 RUN go mod download
 
 COPY . .
+RUN make build
 
 FROM alpine:3.18
 
diff --git a/charts/external-dns/Chart.yaml b/charts/external-dns/Chart.yaml
index 58ee6380f3..9aac5f3078 100644
--- a/charts/external-dns/Chart.yaml
+++ b/charts/external-dns/Chart.yaml
@@ -2,8 +2,8 @@ apiVersion: v2
 name: external-dns
 description: ExternalDNS synchronizes exposed Kubernetes Services and Ingresses with DNS providers.
 type: application
-version: 1.13.0
-appVersion: 0.13.5-202300727-1700-adobe
+version: 1.13.0-20230727-1700-adobe
+appVersion: 0.13.5-20230727-1700-adobe
 keywords:
   - kubernetes
   - externaldns