allow targetarch to be set by Docker buildkit (#6549)

dependabot · Jan 30, 2023 · 0a94b90 · 0a94b90
1 parent 30bcb99
commit 0a94b90
Show file tree

Hide file tree

Showing 8 changed files with 4 additions and 36 deletions.
diff --git a/Dockerfile.updater-core b/Dockerfile.updater-core
@@ -1,7 +1,5 @@
 FROM ubuntu:20.04 as builder
 
-ARG TARGETARCH=amd64
-
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 
 ### SYSTEM DEPENDENCIES

diff --git a/bin/ci-test b/bin/ci-test
@@ -37,23 +37,13 @@ function build() {
   export CORE=dependabot/dependabot-core
   export UPDATER=dependabot/dependabot-updater
 
-  # shellcheck disable=SC2034  # shellcheck isn't smart enough to realize `docker build` uses `TARGETARCH`
-  case "$(uname -m)"
-  in
-    amd64 | x86_64) TARGETARCH=amd64 ;;
-    arm64 | aarch64) TARGETARCH=arm64 ;;
-    *) TARGETARCH=amd64 ;;
-  esac
-
   set -x
   docker build \
-    --build-arg TARGETARCH="$TARGETARCH" \
     --build-arg BUILDKIT_INLINE_CACHE=1 \
     --cache-from ghcr.io/dependabot/dependabot-updater-core \
     -f Dockerfile.updater-core \
     -t "ghcr.io/dependabot/dependabot-updater-core" .
   docker build \
-    --build-arg TARGETARCH="$TARGETARCH" \
     --build-arg OMNIBUS_VERSION=latest \
     --build-arg BUILDKIT_INLINE_CACHE=1 \
     -f "$MODULE/Dockerfile" \

diff --git a/bin/docker-dev-shell b/bin/docker-dev-shell
@@ -42,17 +42,8 @@ build_image() {
   export BUILT_IMAGE=true
   echo "$(tput setaf 2)=> building image from Dockerfile$(tput sgr0)"
 
-  local TARGETARCH;
-  case "$(uname -m)"
-  in
-    amd64 | x86_64) TARGETARCH=amd64 ;;
-    arm64 | aarch64) TARGETARCH=arm64 ;;
-    *) TARGETARCH=amd64 ;;
-  esac
-
   docker build \
     --build-arg BUILDKIT_INLINE_CACHE=1 \
-    --build-arg "TARGETARCH=${TARGETARCH}" \
     --build-arg "USER_UID=$(id -u)" \
     --build-arg "USER_GID=$(id -g)" \
     --cache-from "ghcr.io/dependabot/dependabot-updater-core" \
@@ -62,7 +53,6 @@ build_image() {
 
   docker build \
     --build-arg BUILDKIT_INLINE_CACHE=1 \
-    --build-arg "TARGETARCH=${TARGETARCH}" \
     --cache-from "ghcr.io/dependabot/dependabot-updater-$ECOSYSTEM" \
     -t "dependabot/dependabot-updater-$ECOSYSTEM" \
     -f "$ECOSYSTEM"/Dockerfile \

diff --git a/elm/Dockerfile b/elm/Dockerfile
@@ -1,5 +1,5 @@
 FROM ghcr.io/dependabot/dependabot-updater-core
-ARG TARGETARCH=amd64
+ARG TARGETARCH
 # Install Elm
 # This is currently amd64 only, see:
 # - https://github.com/elm/compiler/issues/2007

diff --git a/go_modules/Dockerfile b/go_modules/Dockerfile
@@ -1,5 +1,5 @@
 FROM ghcr.io/dependabot/dependabot-updater-core
-ARG TARGETARCH=amd64
+ARG TARGETARCH
 
 USER root
 

diff --git a/pub/Dockerfile b/pub/Dockerfile
@@ -1,5 +1,5 @@
 FROM ghcr.io/dependabot/dependabot-updater-core
-ARG TARGETARCH=amd64
+ARG TARGETARCH
 # Install Dart
 ENV PUB_CACHE=/opt/dart/pub-cache \
   PUB_ENVIRONMENT="dependabot" \

diff --git a/script/_common b/script/_common
@@ -5,18 +5,9 @@ function docker_build() {
   [[ -n "$SKIP_BUILD" ]] && return
   ECOSYSTEM="$1"
 
-  local TARGETARCH;
-  case "$(uname -m)"
-  in
-    amd64 | x86_64) TARGETARCH=amd64 ;;
-    arm64 | aarch64) TARGETARCH=arm64 ;;
-    *) TARGETARCH=amd64 ;;
-  esac
-
   # shellcheck disable=SC2086  # as $DOCKER_BUILD_ARGS relies on word-splitting
   docker build \
     $DOCKER_BUILD_ARGS \
-    --build-arg TARGETARCH="$TARGETARCH" \
     --build-arg BUILDKIT_INLINE_CACHE=1 \
     --cache-from "ghcr.io/dependabot/dependabot-updater-core" \
     -t "ghcr.io/dependabot/dependabot-updater-core" \
@@ -26,7 +17,6 @@ function docker_build() {
   # shellcheck disable=SC2086  # as $DOCKER_BUILD_ARGS relies on word-splitting
   docker build \
     $DOCKER_BUILD_ARGS \
-    --build-arg TARGETARCH="$TARGETARCH" \
     --build-arg BUILDKIT_INLINE_CACHE=1 \
     --cache-from "ghcr.io/dependabot/dependabot-updater-$ECOSYSTEM" \
     -t "$LOCAL_IMAGE$ECOSYSTEM" \

diff --git a/terraform/Dockerfile b/terraform/Dockerfile
@@ -1,5 +1,5 @@
 FROM ghcr.io/dependabot/dependabot-updater-core
-ARG TARGETARCH=amd64
+ARG TARGETARCH
 ARG TERRAFORM_VERSION=1.3.7
 ARG TERRAFORM_AMD64_CHECKSUM=b8cf184dee15dfa89713fe56085313ab23db22e17284a9a27c0999c67ce3021e
 ARG TERRAFORM_ARM64_CHECKSUM=5b491c555ea8a62dda551675fd9f27d369f5cdbe87608d2a7367d3da2d38ea38