From 991f788126744b9060634c6c1421348aac5c51b9 Mon Sep 17 00:00:00 2001 From: Chris Fidao Date: Thu, 4 Jan 2024 10:12:10 -0500 Subject: [PATCH] updated docker to version 24 --- Dockerfile | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3ff1f85..3633bb1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,14 +8,18 @@ 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:24.0.7-alpine3.19 -RUN apk add bash ip6tables pigz sysstat procps lsof util-linux-misc xz curl sudo +RUN apk add bash iptables-legacy pigz sysstat procps lsof util-linux-misc xz curl sudo \ + && mv /sbin/iptables /sbin/iptables.original \ + && mv /sbin/ip6tables /sbin/ip6tables.original \ + && ln -s /sbin/iptables-legacy /sbin/iptables \ + && ln -s /sbin/ip6tables-legacy /sbin/ip6tables 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.12 /buildx /usr/libexec/docker/cli-plugins/docker-buildx COPY ./entrypoint ./entrypoint COPY ./docker-entrypoint.d/* ./docker-entrypoint.d/