From b4d872bf43885450000082825f8b490c7e33f8d1 Mon Sep 17 00:00:00 2001 From: Jordan Walster Date: Thu, 23 Jan 2025 23:00:35 +0000 Subject: [PATCH] chore: set static architecture --- .gitea/workflows/build.yaml | 3 ++- Dockerfile | 8 +------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 0d0072a..1d3dc5c 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -10,7 +10,8 @@ jobs: uses: actions/checkout@v4 - name: Build Image run: | - docker build --build-arg PRODUCT=terraform --build-arg VERSION=1.10.5 -t gitea.jrdn.dev/${{vars.REPO_USERNAME}}/terraform-alpine:latest . + docker build --build-arg PRODUCT=terraform --build-arg VERSION=1.10.5 --build-arg ARCH=arm64 \ + -t gitea.jrdn.dev/${{vars.REPO_USERNAME}}/terraform-alpine:latest . - name: Authenticate to Container Registry run: | docker login -u ${{vars.REPO_USERNAME}} -p ${{secrets.REPO_TOKEN}} gitea.jrdn.dev diff --git a/Dockerfile b/Dockerfile index 1e0a80f..3354bf1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,13 +2,7 @@ FROM alpine:latest ARG PRODUCT ARG VERSION - -RUN ARCH=$(uname -m) && \ - if [ "$ARCH" = "x86_64" ]; then \ - ARCH="amd64"; \ - elif [ "$ARCH" = "aarch64" ]; then \ - ARCH="${ARCH}"; \ - fi +ARG ARCH RUN apk add --no-cache git npm bash