diff options
| author | Bjorn Neergaard <bneergaard@mirantis.com> | 2023-01-17 12:00:40 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-17 12:00:40 -0700 |
| commit | 4f716c731ab775a11a89e3366f4c52ff057538d1 (patch) | |
| tree | c503c9a8c57dcaff57dba0aff02a810c198667f9 /Dockerfile | |
| parent | 9052e33a10685a1f2188371624a08be2069889aa (diff) | |
| parent | 71fa3b133744a2f183fbd5e64fd69442287d5017 (diff) | |
| download | docker-4f716c731ab775a11a89e3366f4c52ff057538d1.tar.gz | |
Merge pull request #44812 from crazy-max/fix-arm-build
hack: name for target ARM architecture not specified
Diffstat (limited to 'Dockerfile')
| -rw-r--r-- | Dockerfile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Dockerfile b/Dockerfile index e76733b51f..08b48f97fe 100644 --- a/Dockerfile +++ b/Dockerfile @@ -551,6 +551,7 @@ ARG TARGETPLATFORM RUN --mount=type=cache,sharing=locked,id=moby-build-aptlib,target=/var/lib/apt \ --mount=type=cache,sharing=locked,id=moby-build-aptcache,target=/var/cache/apt \ xx-apt-get install --no-install-recommends -y \ + dpkg-dev \ gcc \ libapparmor-dev \ libc6-dev \ @@ -579,7 +580,7 @@ RUN --mount=type=bind,target=. \ set -e target=$([ "$DOCKER_STATIC" = "1" ] && echo "binary" || echo "dynbinary") xx-go --wrap - ./hack/make.sh $target + PKG_CONFIG=$(xx-go env PKG_CONFIG) ./hack/make.sh $target xx-verify $([ "$DOCKER_STATIC" = "1" ] && echo "--static") /tmp/bundles/${target}-daemon/dockerd$([ "$(xx-info os)" = "windows" ] && echo ".exe") xx-verify $([ "$DOCKER_STATIC" = "1" ] && echo "--static") /tmp/bundles/${target}-daemon/docker-proxy$([ "$(xx-info os)" = "windows" ] && echo ".exe") mkdir /build |