Skip to content
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

Jump to bottom

Upgrade both docker and buildx #15

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
Open

Upgrade both docker and buildx #15

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0ebf902
upgrade both docker and buildx
jeromegn Jun 28, 2022
6d9e6ee
this works better for buildx I believe
jeromegn Jun 30, 2022
fb4c57e
try this from fly-apps/docker-daemon
jeromegn Jun 30, 2022
c25c6ce
downgrade alpine
jeromegn Jun 30, 2022
e56f5d9
go back to 20.10.12
jeromegn Jun 30, 2022
8448a3e
downgrade buildx
jeromegn Jun 30, 2022
c814696
go back to more modern options, failures were unrelated
jeromegn Jun 30, 2022
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
5 changes: 3 additions & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ COPY dockerproxy .

RUN GOOS=linux GARCH=amd64 CGO_ENABLED=0 go build -o dockerproxy -ldflags "-X main.gitSha=$BUILD_SHA -X main.buildTime=$(date +'%Y-%m-%dT%TZ')"

FROM docker:20.10.12-alpine3.15
FROM docker/buildx-bin:v0.8 as buildx
FROM docker:20

RUN apk add bash ip6tables pigz sysstat procps lsof util-linux-misc xz curl sudo rsync

Expand All @@ -30,7 +31,7 @@ RUN ln -s /root/.nix-profile/etc/profile.d/nix.sh /etc/profile.d/nix.sh
COPY etc/docker/daemon.json /etc/docker/daemon.json

COPY --from=build /app/dockerproxy /dockerproxy
COPY --from=docker/buildx-bin:v0.7 /buildx /usr/libexec/docker/cli-plugins/docker-buildx
COPY --from=buildx /buildx /usr/libexec/docker/cli-plugins/docker-buildx

COPY ./entrypoint ./entrypoint
COPY ./docker-entrypoint.d/* ./docker-entrypoint.d/
Expand Down