summaryrefslogtreecommitdiff
path: root/Dockerfile
diff options
context:
space:
mode:
authorCrazyMax <crazy-max@users.noreply.github.com>2022-12-27 02:45:43 +0100
committerCrazyMax <crazy-max@users.noreply.github.com>2023-01-01 18:03:02 +0100
commit347a5f68da9d262762e3cf1b8191067ff786a017 (patch)
treeda6bcc4a4600225583e74eee532b922f68e4d62b /Dockerfile
parente37985f59009186dee26c42e14f03d7a11390f2c (diff)
downloaddocker-347a5f68da9d262762e3cf1b8191067ff786a017.tar.gz
hack: do not set buildmode pie for statically linked binary
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
Diffstat (limited to 'Dockerfile')
-rw-r--r--Dockerfile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Dockerfile b/Dockerfile
index 3632f5f614..2606e856dd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -582,8 +582,8 @@ RUN --mount=type=bind,target=. \
target=$([ "$DOCKER_STATIC" = "1" ] && echo "binary" || echo "dynbinary")
xx-go --wrap
./hack/make.sh $target
- xx-verify /tmp/bundles/${target}-daemon/dockerd$([ "$(xx-info os)" = "windows" ] && echo ".exe")
- xx-verify /tmp/bundles/${target}-daemon/docker-proxy$([ "$(xx-info os)" = "windows" ] && echo ".exe")
+ 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
mv /tmp/bundles/${target}-daemon/* /build/
EOT