crichardson/docker-xubuntu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Do not copy QEMU user binary

Browse Source
This commit is contained in:
Héctor Molinero Fernández
2024-07-20 16:43:33 +02:00
parent f8aa69c376
commit 35ac0ea77d
2 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile.m4
View File

@@ -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"]

2
Makefile
View File

@@ -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' \