From 0ebf902a288b422c5013b45dc2eafd7a6a2acb3a Mon Sep 17 00:00:00 2001 From: Jerome Gravel-Niquet Date: Tue, 28 Jun 2022 11:53:44 -0400 Subject: [PATCH 1/7] upgrade both docker and buildx --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 934a88a..8b9b603 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,7 @@ 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:20.10.17-alpine3.16 RUN apk add bash ip6tables pigz sysstat procps lsof util-linux-misc xz curl sudo rsync @@ -30,7 +30,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=docker/buildx-bin:v0.8 /buildx /usr/libexec/docker/cli-plugins/docker-buildx COPY ./entrypoint ./entrypoint COPY ./docker-entrypoint.d/* ./docker-entrypoint.d/ From 6d9e6ee3e52b341eaa0af3a2ea7fa36c2b755fc3 Mon Sep 17 00:00:00 2001 From: Jerome Gravel-Niquet Date: Thu, 30 Jun 2022 13:05:04 -0400 Subject: [PATCH 2/7] this works better for buildx I believe --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 8b9b603..d23c16b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,6 +8,7 @@ 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/buildx-bin:v0.8 as buildx FROM docker:20.10.17-alpine3.16 RUN apk add bash ip6tables pigz sysstat procps lsof util-linux-misc xz curl sudo rsync @@ -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.8 /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/ From fb4c57e66a29cd4e34eaa2a2608f0b0cf8a956e8 Mon Sep 17 00:00:00 2001 From: Jerome Gravel-Niquet Date: Thu, 30 Jun 2022 13:59:08 -0400 Subject: [PATCH 3/7] try this from fly-apps/docker-daemon --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index d23c16b..4d303ee 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,7 +9,7 @@ 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/buildx-bin:v0.8 as buildx -FROM docker:20.10.17-alpine3.16 +FROM docker:20 RUN apk add bash ip6tables pigz sysstat procps lsof util-linux-misc xz curl sudo rsync From c25c6ce70dc50c6d85bbb7f5b0abf6638e389198 Mon Sep 17 00:00:00 2001 From: Jerome Gravel-Niquet Date: Thu, 30 Jun 2022 14:42:17 -0400 Subject: [PATCH 4/7] downgrade alpine --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 4d303ee..da9733a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,7 +9,7 @@ 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/buildx-bin:v0.8 as buildx -FROM docker:20 +FROM docker:20.10.16-alpine3.15 RUN apk add bash ip6tables pigz sysstat procps lsof util-linux-misc xz curl sudo rsync From e56f5d95f49156c37bfa3b5d8941cd51b55dd1e7 Mon Sep 17 00:00:00 2001 From: Jerome Gravel-Niquet Date: Thu, 30 Jun 2022 14:51:07 -0400 Subject: [PATCH 5/7] go back to 20.10.12 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index da9733a..9dfad23 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,7 +9,7 @@ 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/buildx-bin:v0.8 as buildx -FROM docker:20.10.16-alpine3.15 +FROM docker:20.10.12-alpine3.15 RUN apk add bash ip6tables pigz sysstat procps lsof util-linux-misc xz curl sudo rsync From 8448a3e376978bcb5c777b85ff56ee5ccd453300 Mon Sep 17 00:00:00 2001 From: Jerome Gravel-Niquet Date: Thu, 30 Jun 2022 14:56:39 -0400 Subject: [PATCH 6/7] downgrade buildx --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 9dfad23..e676a5e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,7 @@ 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/buildx-bin:v0.8 as buildx +FROM docker/buildx-bin:v0.7 as buildx FROM docker:20.10.12-alpine3.15 RUN apk add bash ip6tables pigz sysstat procps lsof util-linux-misc xz curl sudo rsync From c814696df70a0da9c8f0c8e8ac3cb63fe259c2fc Mon Sep 17 00:00:00 2001 From: Jerome Gravel-Niquet Date: Thu, 30 Jun 2022 15:13:05 -0400 Subject: [PATCH 7/7] go back to more modern options, failures were unrelated --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index e676a5e..4d303ee 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,8 +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/buildx-bin:v0.7 as buildx -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