Skip to content

Final debug helper images must be for target platform #78

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 27, 2021
Merged

Final debug helper images must be for target platform #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bf64c84
enable mirror.gcr.io registry mirror
briandealwis May 27, 2021
ecadfff
Final helper images must be for target platform
briandealwis May 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion go/helper-image/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ RUN cd delve-source && CGO_ENABLED=0 GOOS=$TARGETOS GOARCH=$TARGETARCH go build

# Now populate the duct-tape image with the language runtime debugging support files
# The debian image is about 95MB bigger
FROM --platform=$BUILDPLATFORM busybox
FROM busybox
# The install script copies all files in /duct-tape to /dbg
COPY install.sh /
CMD ["/bin/sh", "/install.sh"]
Expand Down
8 changes: 6 additions & 2 deletions hack/enable-docker-buildkit.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,15 @@ if [ -f /etc/docker/daemon.json ]; then
echo "/etc/docker/daemon.json was:"
sed 's/^/> /' /etc/docker/daemon.json
echo "/etc/docker/daemon.json now:"
jq '.+{"experimental":true}' /etc/docker/daemon.json | sudo tee /etc/docker/daemon.json
jq '.+{"experimental":true}' /etc/docker/daemon.json \
| jq '."registry-mirrors" += ["https://mirror.gcr.io"]' \
| sudo tee /etc/docker/daemon.json
else
sudo mkdir -vp /etc/docker
echo "/etc/docker/daemon.json now:"
echo '{"experimental":true}' | sudo tee /etc/docker/daemon.json
echo '{"experimental":true}' \
| jq '."registry-mirrors" += ["https://mirror.gcr.io"]' \
| sudo tee /etc/docker/daemon.json
fi

if [ -f $HOME/.docker/config.json ]; then
Expand Down
2 changes: 1 addition & 1 deletion netcore/helper-image/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ RUN apt-get update \

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

# The install script copies all files in /duct-tape to /dbg
Expand Down
2 changes: 1 addition & 1 deletion nodejs/helper-image/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ RUN GOPATH="" CGO_ENABLED=0 GOOS=$TARGETOS GOARCH=$TARGETARCH go build -o node -

# Now populate the duct-tape image with the language runtime debugging support files
# The debian image is about 95MB bigger
FROM --platform=$BUILDPLATFORM busybox
FROM busybox
# The install script copies all files in /duct-tape to /dbg
COPY install.sh /
CMD ["/bin/sh", "/install.sh"]
Expand Down
2 changes: 1 addition & 1 deletion python/helper-image/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ RUN GOPATH="" CGO_ENABLED=0 go build -o launcher -ldflags '-s -w -extldflags "-s

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

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