diff --git a/Dockerfile b/Dockerfile index 933cc8aace..6941a5a63a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -38,8 +38,6 @@ COPY --from=build-dummy /build /build FROM --platform=$BUILDPLATFORM ${GOLANG_IMAGE} AS base COPY --from=xx / / RUN echo 'Binary::apt::APT::Keep-Downloaded-Packages "true";' > /etc/apt/apt.conf.d/keep-cache -ARG APT_MIRROR -RUN test -n "$APT_MIRROR" && sed -ri "s#(httpredir|deb|security).debian.org#${APT_MIRROR}#g" /etc/apt/sources.list.d/debian.sources || true RUN apt-get update && apt-get install --no-install-recommends -y file ENV GO111MODULE=off ENV GOTOOLCHAIN=local diff --git a/Dockerfile.simple b/Dockerfile.simple index efac32e791..6e5939aea4 100644 --- a/Dockerfile.simple +++ b/Dockerfile.simple @@ -14,10 +14,6 @@ FROM ${GOLANG_IMAGE} ENV GO111MODULE=off ENV GOTOOLCHAIN=local -# allow replacing debian mirror -ARG APT_MIRROR -RUN test -n "$APT_MIRROR" && sed -ri "s#(httpredir|deb|security).debian.org#${APT_MIRROR}#g" /etc/apt/sources.list.d/debian.sources || true - # Compile and runtime deps # https://github.com/docker/docker/blob/master/project/PACKAGERS.md#build-dependencies # https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies diff --git a/Makefile b/Makefile index 6275f3e837..2986c1f5f8 100644 --- a/Makefile +++ b/Makefile @@ -138,7 +138,6 @@ endif DOCKER_RUN_DOCKER := $(DOCKER_FLAGS) "$(DOCKER_IMAGE)" DOCKER_BUILD_ARGS += --build-arg=GO_VERSION -DOCKER_BUILD_ARGS += --build-arg=APT_MIRROR DOCKER_BUILD_ARGS += --build-arg=DOCKERCLI_VERSION DOCKER_BUILD_ARGS += --build-arg=DOCKERCLI_REPOSITORY DOCKER_BUILD_ARGS += --build-arg=DOCKERCLI_INTEGRATION_VERSION diff --git a/docker-bake.hcl b/docker-bake.hcl index 5666f83d94..f822ec758b 100644 --- a/docker-bake.hcl +++ b/docker-bake.hcl @@ -1,6 +1,3 @@ -variable "APT_MIRROR" { - default = "" -} variable "DOCKER_DEBUG" { default = "" } @@ -64,7 +61,6 @@ function "bindir" { target "_common" { args = { BUILDKIT_CONTEXT_KEEP_GIT_DIR = 1 - APT_MIRROR = APT_MIRROR DOCKER_DEBUG = DOCKER_DEBUG DOCKER_STATIC = DOCKER_STATIC DOCKER_LDFLAGS = DOCKER_LDFLAGS