Explorar o código

Dockerfile: use default apt mirrors

Use default apt mirrors and also check APT_MIRROR
is set before updating mirrors.

Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
CrazyMax %!s(int64=2) %!d(string=hai) anos
pai
achega
a1d2132bf6
Modificáronse 3 ficheiros con 7 adicións e 9 borrados
  1. 1 2
      Dockerfile
  2. 5 6
      Jenkinsfile
  3. 1 1
      docker-bake.hcl

+ 1 - 2
Dockerfile

@@ -33,8 +33,7 @@ FROM --platform=$BUILDPLATFORM ${GOLANG_IMAGE} AS base
 COPY --from=xx / /
 COPY --from=xx / /
 RUN echo 'Binary::apt::APT::Keep-Downloaded-Packages "true";' > /etc/apt/apt.conf.d/keep-cache
 RUN echo 'Binary::apt::APT::Keep-Downloaded-Packages "true";' > /etc/apt/apt.conf.d/keep-cache
 ARG APT_MIRROR
 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
 ARG DEBIAN_FRONTEND
 RUN apt-get update && apt-get install --no-install-recommends -y file
 RUN apt-get update && apt-get install --no-install-recommends -y file
 ENV GO111MODULE=off
 ENV GO111MODULE=off

+ 5 - 6
Jenkinsfile

@@ -17,7 +17,6 @@ pipeline {
         DOCKER_BUILDKIT     = '1'
         DOCKER_BUILDKIT     = '1'
         DOCKER_EXPERIMENTAL = '1'
         DOCKER_EXPERIMENTAL = '1'
         DOCKER_GRAPHDRIVER  = 'overlay2'
         DOCKER_GRAPHDRIVER  = 'overlay2'
-        APT_MIRROR          = 'cdn-fastly.deb.debian.org'
         CHECK_CONFIG_COMMIT = '33a3680e08d1007e72c3b3f1454f823d8e9948ee'
         CHECK_CONFIG_COMMIT = '33a3680e08d1007e72c3b3f1454f823d8e9948ee'
         TESTDEBUG           = '0'
         TESTDEBUG           = '0'
         TIMEOUT             = '120m'
         TIMEOUT             = '120m'
@@ -78,7 +77,7 @@ pipeline {
                         stage("Build dev image") {
                         stage("Build dev image") {
                             steps {
                             steps {
                                 sh '''
                                 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") {
                         stage("Build dev image") {
                             steps {
                             steps {
                                 sh '''
                                 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") {
                         stage("Build dev image") {
                             steps {
                             steps {
                                 sh '''
                                 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") {
                         stage("Build dev image") {
                             steps {
                             steps {
                                 sh '''
                                 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") {
                         stage("Build dev image") {
                             steps {
                             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") {
                         stage("Unit tests") {

+ 1 - 1
docker-bake.hcl

@@ -1,5 +1,5 @@
 variable "APT_MIRROR" {
 variable "APT_MIRROR" {
-  default = "cdn-fastly.deb.debian.org"
+  default = ""
 }
 }
 variable "DOCKER_DEBUG" {
 variable "DOCKER_DEBUG" {
   default = ""
   default = ""