From e5bfaf19b1ca48203c75b38e5454a05a6bcff4f5 Mon Sep 17 00:00:00 2001 From: Brian Goff Date: Tue, 8 Oct 2019 10:54:39 -0700 Subject: [PATCH] Fix `make cross` target When changing the various cross targets in the Dockerfile I neglected some `;`. Instead of dealing with that now this just sets `--platform` on the cross specific targets which only work on linux/amd64 anyway. Signed-off-by: Brian Goff --- Dockerfile | 38 +++++++++++++++++--------------------- 1 file changed, 17 insertions(+), 21 deletions(-) diff --git a/Dockerfile b/Dockerfile index d882fd49e6..a106c9dbd7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -89,19 +89,17 @@ RUN /download-frozen-image-v2.sh /build \ FROM base AS cross-false -FROM base AS cross-true +FROM --platform=linux/amd64 base AS cross-true ARG DEBIAN_FRONTEND RUN dpkg --add-architecture armhf RUN dpkg --add-architecture arm64 RUN dpkg --add-architecture armel RUN --mount=type=cache,sharing=locked,id=moby-cross-true-aptlib,target=/var/lib/apt \ --mount=type=cache,sharing=locked,id=moby-cross-true-aptcache,target=/var/cache/apt \ - if [ "$(go env GOHOSTARCH)" = "amd64" ]; then \ - apt-get update && apt-get install -y --no-install-recommends \ - crossbuild-essential-armhf \ - crossbuild-essential-arm64 \ - crossbuild-essential-armel \ - fi + apt-get update && apt-get install -y --no-install-recommends \ + crossbuild-essential-armhf \ + crossbuild-essential-arm64 \ + crossbuild-essential-armel FROM cross-${CROSS} as dev-base @@ -113,7 +111,7 @@ RUN --mount=type=cache,sharing=locked,id=moby-cross-false-aptlib,target=/var/lib libapparmor-dev \ libseccomp-dev -FROM cross-true AS runtime-dev-cross-true +FROM --platform=linux/amd64 cross-true AS runtime-dev-cross-true ARG DEBIAN_FRONTEND # These crossbuild packages rely on gcc-, but this doesn't want to install # on non-amd64 systems. @@ -121,19 +119,17 @@ ARG DEBIAN_FRONTEND # other architectures cannnot crossbuild amd64. RUN --mount=type=cache,sharing=locked,id=moby-cross-true-aptlib,target=/var/lib/apt \ --mount=type=cache,sharing=locked,id=moby-cross-true-aptcache,target=/var/cache/apt \ - if [ "$(go env GOHOSTARCH)" = "amd64" ]; then \ - apt-get update && apt-get install -y --no-install-recommends \ - libseccomp-dev:armhf \ - libseccomp-dev:arm64 \ - libseccomp-dev:armel \ - libapparmor-dev:armhf \ - libapparmor-dev:arm64 \ - libapparmor-dev:armel \ - # install this arches seccomp here due to compat issues with the v0 builder - # This is as opposed to inheriting from runtime-dev-cross-false - libapparmor-dev \ - libseccomp-dev \ - fi + apt-get update && apt-get install -y --no-install-recommends \ + libseccomp-dev:armhf \ + libseccomp-dev:arm64 \ + libseccomp-dev:armel \ + libapparmor-dev:armhf \ + libapparmor-dev:arm64 \ + libapparmor-dev:armel \ + # install this arches seccomp here due to compat issues with the v0 builder + # This is as opposed to inheriting from runtime-dev-cross-false + libapparmor-dev \ + libseccomp-dev FROM runtime-dev-cross-${CROSS} AS runtime-dev