Skip to content

Commit

Permalink
Do not copy QEMU user binary
Browse files Browse the repository at this point in the history
  • Loading branch information
hectorm committed Jul 20, 2024
1 parent f8aa69c commit 35ac0ea
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 4 deletions.
2 changes: 0 additions & 2 deletions Dockerfile.m4
Original file line number Diff line number Diff line change
Expand Up @@ -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"]

Expand Down Expand Up @@ -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"]

Expand Down
2 changes: 0 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -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' \
Expand Down

0 comments on commit 35ac0ea

Please sign in to comment.