diff --git a/Dockerfile b/Dockerfile index 7214b0a94a..1be7b5167d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -33,8 +33,7 @@ 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 sed -ri "s/(httpredir|deb).debian.org/${APT_MIRROR:-deb.debian.org}/g" /etc/apt/sources.list \ - && sed -ri "s/(security).debian.org/${APT_MIRROR:-security.debian.org}/g" /etc/apt/sources.list +RUN test -n "$APT_MIRROR" && sed -ri "s/(httpredir|deb|security).debian.org/${APT_MIRROR}/g" /etc/apt/sources.list || true ARG DEBIAN_FRONTEND RUN apt-get update && apt-get install --no-install-recommends -y file ENV GO111MODULE=off diff --git a/Jenkinsfile b/Jenkinsfile index de00e5b31c..6707839168 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -17,7 +17,6 @@ pipeline { DOCKER_BUILDKIT = '1' DOCKER_EXPERIMENTAL = '1' DOCKER_GRAPHDRIVER = 'overlay2' - APT_MIRROR = 'cdn-fastly.deb.debian.org' CHECK_CONFIG_COMMIT = '33a3680e08d1007e72c3b3f1454f823d8e9948ee' TESTDEBUG = '0' TIMEOUT = '120m' @@ -78,7 +77,7 @@ pipeline { stage("Build dev image") { steps { sh ''' - docker build --force-rm --build-arg APT_MIRROR -t docker:${GIT_COMMIT} . + docker build --force-rm -t docker:${GIT_COMMIT} . ''' } } @@ -191,7 +190,7 @@ pipeline { stage("Build dev image") { steps { sh ''' - docker build --force-rm --build-arg APT_MIRROR -t docker:${GIT_COMMIT} . + docker build --force-rm -t docker:${GIT_COMMIT} . ''' } } @@ -278,7 +277,7 @@ pipeline { stage("Build dev image") { steps { sh ''' - docker buildx build --load --force-rm --build-arg APT_MIRROR -t docker:${GIT_COMMIT} . + docker buildx build --load --force-rm -t docker:${GIT_COMMIT} . ''' } } @@ -391,7 +390,7 @@ pipeline { stage("Build dev image") { steps { sh ''' - docker buildx build --load --force-rm --build-arg APT_MIRROR -t docker:${GIT_COMMIT} . + docker buildx build --load --force-rm -t docker:${GIT_COMMIT} . ''' } } @@ -476,7 +475,7 @@ pipeline { } stage("Build dev image") { steps { - sh 'docker build --force-rm --build-arg APT_MIRROR -t docker:${GIT_COMMIT} .' + sh 'docker build --force-rm -t docker:${GIT_COMMIT} .' } } stage("Unit tests") { diff --git a/docker-bake.hcl b/docker-bake.hcl index 0eb078aebc..3d9675f184 100644 --- a/docker-bake.hcl +++ b/docker-bake.hcl @@ -1,5 +1,5 @@ variable "APT_MIRROR" { - default = "cdn-fastly.deb.debian.org" + default = "" } variable "DOCKER_DEBUG" { default = ""