feat: Add ARM images (Resolves #38) (#42)

zachomedia · Jul 6, 2023 · f7403a1 · f7403a1
1 parent 1bebb85
commit f7403a1
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 10 deletions.
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
@@ -15,6 +15,12 @@ jobs:
       -
         name: Checkout
         uses: actions/checkout@v2
+      -
+        name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+      -
+        name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
       -
         name: Set environment variables
         shell: bash
@@ -42,6 +48,7 @@ jobs:
         with:
           push: true
           tags: zachomedia/cert-manager-webhook-pdns:${{ env.TAG }}
+          platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v8
           labels: ${{ steps.meta.outputs.labels }}
           build-args: |
             VERSION=${{ env.TAG }}

diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
@@ -12,6 +12,12 @@ jobs:
       -
         name: Checkout
         uses: actions/checkout@v2
+      -
+        name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+      -
+        name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
       -
         name: Set environment variables
         shell: bash
@@ -33,6 +39,7 @@ jobs:
         with:
           push: false
           tags: zachomedia/cert-manager-webhook-pdns:${{ env.TAG }}
+          platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v8
           labels: ${{ steps.meta.outputs.labels }}
           build-args: |
             VERSION=${{ env.TAG }}

diff --git a/.github/workflows/tags.yaml b/.github/workflows/tags.yaml
@@ -12,6 +12,12 @@ jobs:
       -
         name: Checkout
         uses: actions/checkout@v2
+      -
+        name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+      -
+        name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
       -
         name: Set environment variables
         shell: bash
@@ -39,6 +45,7 @@ jobs:
         with:
           push: true
           tags: zachomedia/cert-manager-webhook-pdns:${{ env.TAG }},zachomedia/cert-manager-webhook-pdns:latest
+          platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v8
           labels: ${{ steps.meta.outputs.labels }}
           build-args: |
             VERSION=${{ env.TAG }}

diff --git a/Makefile b/Makefile
@@ -8,11 +8,11 @@ $(shell mkdir -p "$(OUT)")
 setup:
 	./scripts/fetch-test-binaries.sh
 	./scripts/setup-tests.sh
-	docker-compose -f docker-compose.test.yaml up --build -d
+	docker compose -f docker-compose.test.yaml up --build -d
 
 clean:
 	rm -rf _out/
-	docker-compose -f docker-compose.test.yaml down -v
+	docker compose -f docker-compose.test.yaml down -v
 	go clean
 	go clean -testcache
 

diff --git a/scripts/fetch-test-binaries.sh b/scripts/fetch-test-binaries.sh
@@ -6,14 +6,8 @@ set -e
 #source ${hack_dir}/common.sh
 
 k8s_version=1.26.1
-goarch=amd64
-goos="unknown"
-
-if [[ "$OSTYPE" == "linux-gnu" ]]; then
-  goos="linux"
-elif [[ "$OSTYPE" == "darwin"* ]]; then
-  goos="darwin"
-fi
+goarch=$(go env GOARCH)
+goos=$(go env GOOS)
 
 if [[ "$goos" == "unknown" ]]; then
   echo "OS '$OSTYPE' not supported. Aborting." >&2