Skip to content

Commit 84e9fcd

Browse files
authored
Final debug helper images must be for target platform (#78)
* enable mirror.gcr.io registry mirror in the hope that it avoid rate limits
1 parent 76f0d56 commit 84e9fcd

File tree

5 files changed

+10
-6
lines changed

5 files changed

+10
-6
lines changed

go/helper-image/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ RUN cd delve-source && CGO_ENABLED=0 GOOS=$TARGETOS GOARCH=$TARGETARCH go build
2323

2424
# Now populate the duct-tape image with the language runtime debugging support files
2525
# The debian image is about 95MB bigger
26-
FROM --platform=$BUILDPLATFORM busybox
26+
FROM busybox
2727
# The install script copies all files in /duct-tape to /dbg
2828
COPY install.sh /
2929
CMD ["/bin/sh", "/install.sh"]

hack/enable-docker-buildkit.sh

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,15 @@ if [ -f /etc/docker/daemon.json ]; then
66
echo "/etc/docker/daemon.json was:"
77
sed 's/^/> /' /etc/docker/daemon.json
88
echo "/etc/docker/daemon.json now:"
9-
jq '.+{"experimental":true}' /etc/docker/daemon.json | sudo tee /etc/docker/daemon.json
9+
jq '.+{"experimental":true}' /etc/docker/daemon.json \
10+
| jq '."registry-mirrors" += ["https://mirror.gcr.io"]' \
11+
| sudo tee /etc/docker/daemon.json
1012
else
1113
sudo mkdir -vp /etc/docker
1214
echo "/etc/docker/daemon.json now:"
13-
echo '{"experimental":true}' | sudo tee /etc/docker/daemon.json
15+
echo '{"experimental":true}' \
16+
| jq '."registry-mirrors" += ["https://mirror.gcr.io"]' \
17+
| sudo tee /etc/docker/daemon.json
1418
fi
1519

1620
if [ -f $HOME/.docker/config.json ]; then

netcore/helper-image/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ RUN apt-get update \
55

66
# Now populate the duct-tape image with the language runtime debugging support files
77
# The debian image is about 95MB bigger
8-
FROM --platform=$BUILDPLATFORM busybox
8+
FROM busybox
99
ARG BUILDPLATFORM
1010

1111
# The install script copies all files in /duct-tape to /dbg

nodejs/helper-image/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ RUN GOPATH="" CGO_ENABLED=0 GOOS=$TARGETOS GOARCH=$TARGETARCH go build -o node -
1010

1111
# Now populate the duct-tape image with the language runtime debugging support files
1212
# The debian image is about 95MB bigger
13-
FROM --platform=$BUILDPLATFORM busybox
13+
FROM busybox
1414
# The install script copies all files in /duct-tape to /dbg
1515
COPY install.sh /
1616
CMD ["/bin/sh", "/install.sh"]

python/helper-image/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ RUN GOPATH="" CGO_ENABLED=0 go build -o launcher -ldflags '-s -w -extldflags "-s
7676

7777
# Now populate the duct-tape image with the language runtime debugging support files
7878
# The debian image is about 95MB bigger
79-
FROM --platform=$BUILDPLATFORM busybox
79+
FROM busybox
8080
ARG BUILDPLATFORM
8181

8282
# The install script copies all files in /duct-tape to /dbg

0 commit comments

Comments
 (0)