From 6a250ecfb116f2281fd5f6465c772f8e4cb444e7 Mon Sep 17 00:00:00 2001 From: Jordan Walster Date: Thu, 23 Jan 2025 22:56:17 +0000 Subject: [PATCH] Revert "chore: move architecture check to host container" This reverts commit 2bf4cfa8c369b6da8a5980f91020333ca4fac8bb. --- .gitea/workflows/build.yaml | 10 +--------- Dockerfile | 8 +++++++- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 6fbff31..0d0072a 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -8,17 +8,9 @@ jobs: steps: - name: Check out uses: actions/checkout@v4 - - name: Check Architecture - run: | - if [ "$ARCH" = "x86_64" ]; then \ - ARCH="amd64"; \ - elif [ "$ARCH" = "aarch64" ]; then \ - ARCH="${ARCH}"; \ - fi - name: Build Image run: | - docker build --build-arg PRODUCT=terraform --build-arg VERSION=1.10.5 --build-arg=$ARCH \ - -t gitea.jrdn.dev/${{vars.REPO_USERNAME}}/terraform-alpine:latest . + docker build --build-arg PRODUCT=terraform --build-arg VERSION=1.10.5 -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 3354bf1..1e0a80f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,13 @@ FROM alpine:latest ARG PRODUCT ARG VERSION -ARG ARCH + +RUN ARCH=$(uname -m) && \ + if [ "$ARCH" = "x86_64" ]; then \ + ARCH="amd64"; \ + elif [ "$ARCH" = "aarch64" ]; then \ + ARCH="${ARCH}"; \ + fi RUN apk add --no-cache git npm bash