[build]: add the support of Apt-Cacher-NG proxy configuration to the …

…slave docker build script (#3256) Signed-off-by: wangshengjun <wangshengjun@asterfusion.com>
sonic-net · Aug 9, 2019 · ef5064f · ef5064f
1 parent 3e6e037
commit ef5064f
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 0 deletions.
diff --git a/Makefile.work b/Makefile.work
@@ -141,6 +141,7 @@ DOCKER_BASE_BUILD = docker build --no-cache \
 		    -t $(SLAVE_BASE_IMAGE):$(SLAVE_BASE_TAG) \
 		    --build-arg http_proxy=$(http_proxy) \
 		    --build-arg https_proxy=$(https_proxy) \
+		    --build-arg apt_cacher_ng_proxy=$(apt_cacher_ng_proxy) \
 		    $(SLAVE_DIR)
 
 DOCKER_BUILD = docker build --no-cache \
@@ -149,6 +150,7 @@ DOCKER_BUILD = docker build --no-cache \
 	       --build-arg guid=$(shell id -g) \
 	       --build-arg hostname=$(shell echo $$HOSTNAME) \
                --build-arg slave_base_tag_ref=$(SLAVE_BASE_TAG) \
+	       --build-arg apt_cacher_ng_proxy=$(apt_cacher_ng_proxy) \
 	       -t $(SLAVE_IMAGE):$(SLAVE_TAG) \
 	       -f $(SLAVE_DIR)/Dockerfile.user \
 	       $(SLAVE_DIR)
@@ -173,6 +175,7 @@ SONIC_BUILD_INSTRUCTION :=  make \
                            KERNEL_PROCURE_METHOD=$(KERNEL_PROCURE_METHOD) \
                            HTTP_PROXY=$(http_proxy) \
                            HTTPS_PROXY=$(https_proxy) \
+		           APT_CACHER_NG_PROXY=$(apt_cacher_ng_proxy) \
                            SONIC_ENABLE_SYSTEM_TELEMETRY=$(ENABLE_SYSTEM_TELEMETRY) \
                            EXTRA_JESSIE_TARGETS=$(EXTRA_JESSIE_TARGETS) \
                            $(SONIC_OVERRIDE_BUILD_VARS)

diff --git a/dockers/docker-base-stretch/Dockerfile.j2 b/dockers/docker-base-stretch/Dockerfile.j2
@@ -21,6 +21,10 @@ RUN while [ -n "$(find /usr/share/doc -depth -type d -empty -print -exec rmdir {
     /var/cache/man/*     \
     /usr/share/locale/*
 
+{% if APT_CACHER_NG_PROXY.strip() -%}
+        RUN echo 'Acquire::http::Proxy "{{APT_CACHER_NG_PROXY}}";' >> /etc/apt/apt.conf.d/02proxy
+{%- endif %}
+
 # Make apt-get non-interactive
 ENV DEBIAN_FRONTEND=noninteractive
 

diff --git a/dockers/docker-base/Dockerfile.j2 b/dockers/docker-base/Dockerfile.j2
@@ -23,6 +23,10 @@ RUN rm -rf               \
     /var/cache/man/*     \
     /usr/share/locale/*
 
+{% if APT_CACHER_NG_PROXY.strip() -%}
+        RUN echo 'Acquire::http::Proxy "{{APT_CACHER_NG_PROXY}}";' >> /etc/apt/apt.conf.d/02proxy
+{%- endif %}
+
 # Make apt-get non-interactive
 ENV DEBIAN_FRONTEND=noninteractive
 

diff --git a/slave.mk b/slave.mk
@@ -184,6 +184,7 @@ $(info "ENABLE_SYNCD_RPC"                : "$(ENABLE_SYNCD_RPC)")
 $(info "ENABLE_ORGANIZATION_EXTENSIONS"  : "$(ENABLE_ORGANIZATION_EXTENSIONS)")
 $(info "HTTP_PROXY"                      : "$(HTTP_PROXY)")
 $(info "HTTPS_PROXY"                     : "$(HTTPS_PROXY)")
+$(info "APT_CACHER_NG_PROXY"             : "$(APT_CACHER_NG_PROXY)")
 $(info "ENABLE_SYSTEM_TELEMETRY"         : "$(ENABLE_SYSTEM_TELEMETRY)")
 $(info "SONIC_DEBUGGING_ON"              : "$(SONIC_DEBUGGING_ON)")
 $(info "SONIC_PROFILING_ON"              : "$(SONIC_PROFILING_ON)")

diff --git a/sonic-slave-stretch/Dockerfile.j2 b/sonic-slave-stretch/Dockerfile.j2
@@ -32,6 +32,10 @@ RUN echo "deb [arch=arm64] http://deb.debian.org/debian stretch main contrib non
         echo 'deb [arch=arm64] http://ftp.debian.org/debian stretch-backports main' >> /etc/apt/sources.list
 {%- endif %}
 
+
+ARG apt_cacher_ng_proxy
+RUN echo "Acquire::http::Proxy \"$apt_cacher_ng_proxy\";" >> /etc/apt/apt.conf.d/02proxy
+
 ## Make apt-get non-interactive
 ENV DEBIAN_FRONTEND=noninteractive
 

diff --git a/sonic-slave/Dockerfile.j2 b/sonic-slave/Dockerfile.j2
@@ -28,6 +28,9 @@ RUN echo "deb [arch=arm64] http://archive.debian.org/debian jessie main contrib
         echo "deb [arch=arm64] http://archive.debian.org/debian jessie-backports main contrib non-free" >> /etc/apt/sources.list
 {% endif %}
 
+ARG apt_cacher_ng_proxy
+RUN echo "Acquire::http::Proxy \"$apt_cacher_ng_proxy\";" >> /etc/apt/apt.conf.d/02proxy
+
 ## Make apt-get non-interactive
 ENV DEBIAN_FRONTEND=noninteractive