From 35ac0ea77d0b1e4e1e2a4f50489c19ad11e3436c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A9ctor=20Molinero=20Fern=C3=A1ndez?= Date: Sat, 20 Jul 2024 16:43:33 +0200 Subject: [PATCH] Do not copy QEMU user binary --- Dockerfile.m4 | 2 -- Makefile | 2 -- 2 files changed, 4 deletions(-) diff --git a/Dockerfile.m4 b/Dockerfile.m4 index 0d2fe6f..cf44bb5 100644 --- a/Dockerfile.m4 +++ b/Dockerfile.m4 @@ -5,7 +5,6 @@ m4_changequote([[, ]]) ################################################## m4_ifdef([[CROSS_ARCH]], [[FROM docker.io/CROSS_ARCH/ubuntu:24.04]], [[FROM docker.io/ubuntu:24.04]]) AS build -m4_ifdef([[CROSS_QEMU]], [[COPY --from=docker.io/hectorm/qemu-user-static:latest CROSS_QEMU CROSS_QEMU]]) SHELL ["/bin/sh", "-euc"] @@ -227,7 +226,6 @@ EOF ################################################## m4_ifdef([[CROSS_ARCH]], [[FROM docker.io/CROSS_ARCH/ubuntu:24.04]], [[FROM docker.io/ubuntu:24.04]]) AS main -m4_ifdef([[CROSS_QEMU]], [[COPY --from=docker.io/hectorm/qemu-user-static:latest CROSS_QEMU CROSS_QEMU]]) SHELL ["/bin/sh", "-euc"] diff --git a/Makefile b/Makefile index fae8533..4797205 100755 --- a/Makefile +++ b/Makefile @@ -73,7 +73,6 @@ $(IMAGE_AMD64_DOCKERFILE): $(DOCKERFILE_TEMPLATE) '$(M4)' \ --prefix-builtins \ --define=CROSS_ARCH=amd64 \ - --define=CROSS_QEMU=/usr/bin/qemu-x86_64-static \ --define=ENABLE_AMD_SUPPORT=1 \ --define=ENABLE_INTEL_SUPPORT=1 \ --define=ENABLE_NVIDIA_SUPPORT=1 \ @@ -92,7 +91,6 @@ $(IMAGE_ARM64V8_DOCKERFILE): $(DOCKERFILE_TEMPLATE) '$(M4)' \ --prefix-builtins \ --define=CROSS_ARCH=arm64v8 \ - --define=CROSS_QEMU=/usr/bin/qemu-aarch64-static \ '$(DOCKERFILE_TEMPLATE)' > '$@' '$(DOCKER)' build $(IMAGE_BUILD_OPTS) \ --tag '$(IMAGE_NAME):$(IMAGE_VERSION)-arm64v8' \