From d4b5025ca16a11c4d9654df419c191a8481e62cb Mon Sep 17 00:00:00 2001
From: Elijah Buck <elijah@github.com>
Date: Sun, 8 Dec 2024 21:34:11 +0000
Subject: [PATCH] docker push

---
 .github/workflows/sifio-smtp-aks.yml | 4 +++-
 .github/workflows/sifio-www-aks.yml  | 4 +++-
 config/smtp/Dockerfile               | 2 +-
 config/www/Dockerfile                | 4 ++--
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/sifio-smtp-aks.yml b/.github/workflows/sifio-smtp-aks.yml
index 2821f40..0664fc7 100644
--- a/.github/workflows/sifio-smtp-aks.yml
+++ b/.github/workflows/sifio-smtp-aks.yml
@@ -72,7 +72,9 @@ jobs:
     # Builds and pushes an image up to your Azure Container Registry
     - name: Build and push image to ACR
       run: |
-        az acr build --image ${{ env.AZURE_CONTAINER_REGISTRY }}.azurecr.io/${{ env.CONTAINER_NAME }}:${{ github.sha }} --registry ${{ env.AZURE_CONTAINER_REGISTRY }} -g ${{ env.RESOURCE_GROUP }} --file config/smtp/Dockerfile .
+        az acr login --name ${{ env.AZURE_CONTAINER_REGISTRY }}
+        docker build -t ${{ env.AZURE_CONTAINER_REGISTRY }}.azurecr.io/${{ env.CONTAINER_NAME }}:${{ github.sha }} -f config/www/Dockerfile .
+        docker push ${{ env.AZURE_CONTAINER_REGISTRY }}.azurecr.io/${{ env.CONTAINER_NAME }}:${{ github.sha }}
 
   createSecret:
     permissions:
diff --git a/.github/workflows/sifio-www-aks.yml b/.github/workflows/sifio-www-aks.yml
index 576ee53..bd2802f 100644
--- a/.github/workflows/sifio-www-aks.yml
+++ b/.github/workflows/sifio-www-aks.yml
@@ -72,7 +72,9 @@ jobs:
     # Builds and pushes an image up to your Azure Container Registry
     - name: Build and push image to ACR
       run: |
-        az acr build --image ${{ env.AZURE_CONTAINER_REGISTRY }}.azurecr.io/${{ env.CONTAINER_NAME }}:${{ github.sha }} --registry ${{ env.AZURE_CONTAINER_REGISTRY }} -g ${{ env.RESOURCE_GROUP }} --file config/www/Dockerfile .
+        az acr login --name ${{ env.AZURE_CONTAINER_REGISTRY }}
+        docker build -t ${{ env.AZURE_CONTAINER_REGISTRY }}.azurecr.io/${{ env.CONTAINER_NAME }}:${{ github.sha }} -f config/www/Dockerfile .
+        docker push ${{ env.AZURE_CONTAINER_REGISTRY }}.azurecr.io/${{ env.CONTAINER_NAME }}:${{ github.sha }}
 
   createSecret:
     permissions:
diff --git a/config/smtp/Dockerfile b/config/smtp/Dockerfile
index 47e1e11..adf744a 100644
--- a/config/smtp/Dockerfile
+++ b/config/smtp/Dockerfile
@@ -9,7 +9,7 @@ RUN go build -v -o /usr/local/bin/app cmd/smtp/main.go
 
 # sudo apt-get install qemu binfmt-support qemu-user-static
 # docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
-FROM --platform=linux/arm64/v8 arm64v8/alpine:3.14
+FROM --platform=linux/arm64/v8 arm64v8/alpine:3
 WORKDIR /usr/src/app
 COPY --from=0 /usr/local/bin/app /usr/local/bin/app
 
diff --git a/config/www/Dockerfile b/config/www/Dockerfile
index e08dd98..52a4042 100644
--- a/config/www/Dockerfile
+++ b/config/www/Dockerfile
@@ -1,4 +1,4 @@
-FROM arm64v8/golang:1-alpine
+FROM golang:1-alpine
 
 WORKDIR /usr/src/app
 ENV GOARCH=arm64
@@ -9,7 +9,7 @@ RUN go build -v -o /usr/local/bin/app cmd/www/main.go
 
 # sudo apt-get install qemu binfmt-support qemu-user-static
 # docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
-FROM --platform=linux/arm64/v8 arm64v8/alpine:3.14
+FROM --platform=linux/arm64/v8 arm64v8/alpine:3
 WORKDIR /usr/src/app
 COPY --from=0 /usr/local/bin/app /usr/local/bin/app