[Makefile.work] Add DOCKER_EXTRA_OPTS (#7775)
#### Why I did it Usecase: export DOCKER_EXTRA_OPTS="--registry-mirror=https://some.host" - to avoid DockerHub pull rate limiting. #### How I did it Added DOCKER_EXTRA_OPTS #### How to verify it export DOCKER_EXTRA_OPTS="--registry-mirror=https://some.host" make target/sonic-mellanox.bin
This commit is contained in:
parent
b70a46cd3e
commit
4594e32f0c
@ -38,6 +38,7 @@
|
|||||||
# * SONIC_DPKG_CACHE_METHOD: Specifying method of obtaining the Debian packages from cache: none or cache
|
# * SONIC_DPKG_CACHE_METHOD: Specifying method of obtaining the Debian packages from cache: none or cache
|
||||||
# * SONIC_DPKG_CACHE_SOURCE: Debian package cache location when cache enabled for debian packages
|
# * SONIC_DPKG_CACHE_SOURCE: Debian package cache location when cache enabled for debian packages
|
||||||
# * BUILD_LOG_TIMESTAMP: Set timestamp in the build log (simple/none)
|
# * BUILD_LOG_TIMESTAMP: Set timestamp in the build log (simple/none)
|
||||||
|
# * DOCKER_EXTRA_OPTS: Extra command line arguments for dockerd running in slave container.
|
||||||
#
|
#
|
||||||
###############################################################################
|
###############################################################################
|
||||||
|
|
||||||
@ -131,7 +132,7 @@ $(shell SONIC_VERSION_CONTROL_COMPONENTS=$(SONIC_VERSION_CONTROL_COMPONENTS) \
|
|||||||
scripts/generate_buildinfo_config.sh)
|
scripts/generate_buildinfo_config.sh)
|
||||||
|
|
||||||
# Generate the slave Dockerfile, and prepare build info for it
|
# Generate the slave Dockerfile, and prepare build info for it
|
||||||
$(shell CONFIGURED_ARCH=$(CONFIGURED_ARCH) MULTIARCH_QEMU_ENVIRON=$(MULTIARCH_QEMU_ENVIRON) j2 $(SLAVE_DIR)/Dockerfile.j2 > $(SLAVE_DIR)/Dockerfile)
|
$(shell CONFIGURED_ARCH=$(CONFIGURED_ARCH) MULTIARCH_QEMU_ENVIRON=$(MULTIARCH_QEMU_ENVIRON) DOCKER_EXTRA_OPTS=$(DOCKER_EXTRA_OPTS) j2 $(SLAVE_DIR)/Dockerfile.j2 > $(SLAVE_DIR)/Dockerfile)
|
||||||
$(shell CONFIGURED_ARCH=$(CONFIGURED_ARCH) MULTIARCH_QEMU_ENVIRON=$(MULTIARCH_QEMU_ENVIRON) j2 $(SLAVE_DIR)/Dockerfile.user.j2 > $(SLAVE_DIR)/Dockerfile.user)
|
$(shell CONFIGURED_ARCH=$(CONFIGURED_ARCH) MULTIARCH_QEMU_ENVIRON=$(MULTIARCH_QEMU_ENVIRON) j2 $(SLAVE_DIR)/Dockerfile.user.j2 > $(SLAVE_DIR)/Dockerfile.user)
|
||||||
$(shell BUILD_SLAVE=y scripts/prepare_docker_buildinfo.sh $(SLAVE_BASE_IMAGE) $(SLAVE_DIR)/Dockerfile $(CONFIGURED_ARCH) "" $(BLDENV))
|
$(shell BUILD_SLAVE=y scripts/prepare_docker_buildinfo.sh $(SLAVE_BASE_IMAGE) $(SLAVE_DIR)/Dockerfile $(CONFIGURED_ARCH) "" $(BLDENV))
|
||||||
|
|
||||||
|
@ -479,7 +479,7 @@ RUN add-apt-repository \
|
|||||||
stable"
|
stable"
|
||||||
RUN apt-get update
|
RUN apt-get update
|
||||||
RUN apt-get install -y docker-ce=5:18.09.5~3-0~debian-buster docker-ce-cli=5:18.09.5~3-0~debian-buster
|
RUN apt-get install -y docker-ce=5:18.09.5~3-0~debian-buster docker-ce-cli=5:18.09.5~3-0~debian-buster
|
||||||
RUN echo "DOCKER_OPTS=\"--experimental --storage-driver=vfs\"" >> /etc/default/docker
|
RUN echo "DOCKER_OPTS=\"--experimental --storage-driver=vfs {{ DOCKER_EXTRA_OPTS }}\"" >> /etc/default/docker
|
||||||
RUN update-alternatives --set iptables /usr/sbin/iptables-legacy
|
RUN update-alternatives --set iptables /usr/sbin/iptables-legacy
|
||||||
|
|
||||||
# Install m2crypto package, needed by SWI tools
|
# Install m2crypto package, needed by SWI tools
|
||||||
|
@ -332,7 +332,7 @@ RUN apt-get install -y docker-ce=18.03.1~ce-0~debian
|
|||||||
{%- elif CONFIGURED_ARCH == "armhf" %}
|
{%- elif CONFIGURED_ARCH == "armhf" %}
|
||||||
RUN apt-get install -y docker-ce=18.06.3~ce~3-0~debian
|
RUN apt-get install -y docker-ce=18.06.3~ce~3-0~debian
|
||||||
{%- endif %}
|
{%- endif %}
|
||||||
RUN echo "DOCKER_OPTS=\"--experimental --storage-driver=vfs\"" >> /etc/default/docker
|
RUN echo "DOCKER_OPTS=\"--experimental --storage-driver=vfs {{ DOCKER_EXTRA_OPTS }}\"" >> /etc/default/docker
|
||||||
|
|
||||||
# For jenkins slave
|
# For jenkins slave
|
||||||
RUN echo "deb [arch={{ CONFIGURED_ARCH }}] http://archive.debian.org/debian jessie-backports main" >> /etc/apt/sources.list
|
RUN echo "deb [arch={{ CONFIGURED_ARCH }}] http://archive.debian.org/debian jessie-backports main" >> /etc/apt/sources.list
|
||||||
|
@ -428,7 +428,7 @@ RUN apt-get install -y docker-ce=5:18.09.5~3-0~debian-stretch docker-ce-cli=5:18
|
|||||||
{%- else %}
|
{%- else %}
|
||||||
RUN apt-get install -y docker-ce=18.06.3~ce~3-0~debian
|
RUN apt-get install -y docker-ce=18.06.3~ce~3-0~debian
|
||||||
{%- endif %}
|
{%- endif %}
|
||||||
RUN echo "DOCKER_OPTS=\"--experimental --storage-driver=vfs\"" >> /etc/default/docker
|
RUN echo "DOCKER_OPTS=\"--experimental --storage-driver=vfs {{ DOCKER_EXTRA_OPTS }}\"" >> /etc/default/docker
|
||||||
|
|
||||||
# Install m2crypto package, needed by SWI tools
|
# Install m2crypto package, needed by SWI tools
|
||||||
RUN pip install m2crypto==0.36.0
|
RUN pip install m2crypto==0.36.0
|
||||||
|
Loading…
Reference in New Issue
Block a user