Skip to content

Commit bc30528

Browse files
Parallel building of sonic dockers using native dockerd(dood). (#10352)
Currently, the build dockers are created as a user dockers(docker-base-stretch-<user>, etc) that are specific to each user. But the sonic dockers (docker-database, docker-swss, etc) are created with a fixed docker name and common to all the users. docker-database:latest docker-swss:latest When multiple builds are triggered on the same build server that creates parallel building issue because all the build jobs are trying to create the same docker with latest tag. This happens only when sonic dockers are built using native host dockerd for sonic docker image creation. This patch creates all sonic dockers as user sonic dockers and then, while saving and loading the user sonic dockers, it rename the user sonic dockers into correct sonic dockers with tag as latest. docker-database:latest <== SAVE/LOAD ==> docker-database-<user>:tag The user sonic docker names are derived from 'DOCKER_USERNAME and DOCKER_USERTAG' make env variable and using Jinja template, it replaces the FROM docker name with correct user sonic docker name for loading and saving the docker image.
1 parent 313cced commit bc30528

File tree

65 files changed

+185
-76
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+185
-76
lines changed

Makefile

+2-1
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ endif
4040
ifeq ($(NOBULLSEYE), 0)
4141
BLDENV=bullseye make -f Makefile.work $@
4242
endif
43+
BLDENV=bullseye make -f Makefile.work docker-cleanup
4344

4445
jessie:
4546
@echo "+++ Making $@ +++"
@@ -83,7 +84,7 @@ $(PLATFORM_PATH):
8384
configure : $(PLATFORM_PATH)
8485
$(call make_work, $@)
8586

86-
clean reset showtag sonic-slave-build sonic-slave-bash :
87+
clean reset showtag docker-cleanup sonic-slave-build sonic-slave-bash :
8788
$(call make_work, $@)
8889

8990
# Freeze the versions, see more detail options: scripts/versions_manager.py freeze -h

Makefile.work

+46-1
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@ $(shell rm -f .screen)
9090
MAKEFLAGS += -B
9191

9292
CONFIGURED_ARCH := $(shell [ -f .arch ] && cat .arch || echo $(PLATFORM_ARCH))
93+
CONFIGURED_PLATFORM = $(if $(PLATFORM),$(PLATFORM),$(shell cat .platform 2>/dev/null))
9394
ifeq ($(CONFIGURED_ARCH),)
9495
override CONFIGURED_ARCH = amd64
9596
endif
@@ -149,7 +150,9 @@ $(shell BUILD_SLAVE=y DEFAULT_CONTAINER_REGISTRY=$(DEFAULT_CONTAINER_REGISTRY) s
149150

150151
# Add the versions in the tag, if the version change, need to rebuild the slave
151152
SLAVE_BASE_TAG = $(shell cat $(SLAVE_DIR)/Dockerfile $(SLAVE_DIR)/buildinfo/versions/versions-* src/sonic-build-hooks/hooks/* | sha1sum | awk '{print substr($$1,0,11);}')
152-
SLAVE_TAG = $(shell cat $(SLAVE_DIR)/Dockerfile.user $(SLAVE_DIR)/Dockerfile $(SLAVE_DIR)/buildinfo/versions/versions-* | sha1sum | awk '{print substr($$1,0,11);}')
153+
# Calculate the slave TAG based on $(USER)/$(PWD)/$(CONFIGURED_PLATFORM) to get unique SHA ID
154+
SLAVE_TAG = $(shell (cat $(SLAVE_DIR)/Dockerfile.user $(SLAVE_DIR)/Dockerfile $(SLAVE_DIR)/buildinfo/versions/versions-* .git/HEAD && echo $(USER)/$(PWD)/$(CONFIGURED_PLATFORM)) \
155+
| sha1sum | awk '{print substr($$1,0,11);}')
153156

154157
OVERLAY_MODULE_CHECK := \
155158
lsmod | grep -q "^overlay " &>/dev/null || \
@@ -159,6 +162,14 @@ OVERLAY_MODULE_CHECK := \
159162

160163
BUILD_TIMESTAMP := $(shell date +%Y%m%d\.%H%M%S)
161164

165+
# Create separate Docker lockfiles for saving vs. loading an image.
166+
ifeq ($(DOCKER_LOCKDIR),)
167+
override DOCKER_LOCKDIR := /tmp/docklock
168+
endif
169+
DOCKER_LOCKFILE_SAVE := $(DOCKER_LOCKDIR)/docker_save.lock
170+
$(shell mkdir -m 0777 -p $(DOCKER_LOCKDIR))
171+
$(shell [ -f $(DOCKER_LOCKFILE_SAVE) ] || (touch $(DOCKER_LOCKFILE_SAVE) && chmod 0777 $(DOCKER_LOCKFILE_SAVE)))
172+
162173
ifeq ($(DOCKER_BUILDER_MOUNT),)
163174
override DOCKER_BUILDER_MOUNT := "$(PWD):/sonic"
164175
endif
@@ -169,6 +180,7 @@ endif
169180

170181
DOCKER_RUN := docker run --rm=true --privileged --init \
171182
-v $(DOCKER_BUILDER_MOUNT) \
183+
-v "$(DOCKER_LOCKDIR):$(DOCKER_LOCKDIR)" \
172184
-w $(DOCKER_BUILDER_WORKDIR) \
173185
-e "http_proxy=$(http_proxy)" \
174186
-e "https_proxy=$(https_proxy)" \
@@ -199,6 +211,30 @@ ifneq ($(SIGNING_CERT),)
199211
endif
200212
endif
201213

214+
# User name and tag for "docker-*" images created by native dockerd mode.
215+
ifeq ($(strip $(SONIC_CONFIG_USE_NATIVE_DOCKERD_FOR_BUILD)),y)
216+
DOCKER_USERNAME = $(USER_LC)
217+
DOCKER_USERTAG = $(SLAVE_TAG)
218+
else
219+
DOCKER_USERNAME = sonic
220+
DOCKER_USERTAG = latest
221+
endif
222+
223+
# Define canned sequence to clean up Docker image cache.
224+
# - These are the remnants from building the runtime Docker images using native (host) Docker daemon.
225+
# - Image naming convention differs on a shared build system vs. non-shared.
226+
# $(docker-image-cleanup)
227+
ifeq ($(SONIC_CONFIG_USE_NATIVE_DOCKERD_FOR_BUILD),y)
228+
define docker-image-cleanup
229+
@for i in $(shell docker images --quiet --filter 'dangling=true') ; do (docker rmi -f $$i &> /dev/null || true) ; done
230+
@for i in $(shell docker images --quiet docker-*$(DOCKER_USERNAME):$(DOCKER_USERTAG)) ; do (docker rmi -f $$i &> /dev/null || true) ; done
231+
endef
232+
else
233+
define docker-image-cleanup
234+
@:
235+
endef
236+
endif
237+
202238
ifeq ($(SONIC_CONFIG_USE_NATIVE_DOCKERD_FOR_BUILD), y)
203239
ifneq ($(MULTIARCH_QEMU_ENVIRON), y)
204240
DOCKER_RUN += -v /var/run/docker.sock:/var/run/docker.sock
@@ -274,6 +310,7 @@ SONIC_BUILD_INSTRUCTION := make \
274310
BUILD_NUMBER=$(BUILD_NUMBER) \
275311
BUILD_TIMESTAMP=$(BUILD_TIMESTAMP) \
276312
SONIC_IMAGE_VERSION=$(SONIC_IMAGE_VERSION) \
313+
SLAVE_TAG=$(SLAVE_TAG) \
277314
ENABLE_DHCP_GRAPH_SERVICE=$(ENABLE_DHCP_GRAPH_SERVICE) \
278315
ENABLE_ZTP=$(ENABLE_ZTP) \
279316
INCLUDE_PDE=$(INCLUDE_PDE) \
@@ -298,6 +335,11 @@ SONIC_BUILD_INSTRUCTION := make \
298335
HTTP_PROXY=$(http_proxy) \
299336
HTTPS_PROXY=$(https_proxy) \
300337
NO_PROXY=$(no_proxy) \
338+
DOCKER_USERNAME=$(DOCKER_USERNAME) \
339+
DOCKER_USERTAG=$(DOCKER_USERTAG) \
340+
DOCKER_LOCKDIR=$(DOCKER_LOCKDIR) \
341+
DOCKER_LOCKFILE_SAVE=$(DOCKER_LOCKFILE_SAVE) \
342+
SONIC_CONFIG_USE_NATIVE_DOCKERD_FOR_BUILD=$(SONIC_CONFIG_USE_NATIVE_DOCKERD_FOR_BUILD) \
301343
SONIC_INCLUDE_SYSTEM_TELEMETRY=$(INCLUDE_SYSTEM_TELEMETRY) \
302344
INCLUDE_DHCP_RELAY=$(INCLUDE_DHCP_RELAY) \
303345
SONIC_INCLUDE_RESTAPI=$(INCLUDE_RESTAPI) \
@@ -352,6 +394,9 @@ else
352394
@$(DOCKER_RUN) $(SLAVE_IMAGE):$(SLAVE_TAG) bash -c "$(SONIC_BUILD_INSTRUCTION) $@; scripts/collect_build_version_files.sh \$$?"
353395
endif
354396

397+
docker-cleanup:
398+
$(docker-image-cleanup)
399+
355400
sonic-build-hooks:
356401
@pushd src/sonic-build-hooks; TRUSTED_GPG_URLS=$(TRUSTED_GPG_URLS) make all; popd
357402
@cp src/sonic-build-hooks/buildinfo/sonic-build-hooks* $(SLAVE_DIR)/buildinfo

dockers/docker-config-engine-bullseye/Dockerfile.j2

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{% from "dockers/dockerfile-macros.j2" import install_debian_packages, install_python_wheels, copy_files %}
2-
FROM docker-base-bullseye
2+
FROM docker-base-bullseye-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}}
33

44
## Make apt-get non-interactive
55
ENV DEBIAN_FRONTEND=noninteractive

dockers/docker-config-engine-buster/Dockerfile.j2

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{% from "dockers/dockerfile-macros.j2" import install_debian_packages, install_python_wheels, copy_files %}
2-
FROM docker-base-buster
2+
FROM docker-base-buster-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}}
33

44
## Make apt-get non-interactive
55
ENV DEBIAN_FRONTEND=noninteractive

dockers/docker-config-engine-stretch/Dockerfile.j2

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{% from "dockers/dockerfile-macros.j2" import install_debian_packages, install_python_wheels, copy_files %}
2-
FROM docker-base-stretch
2+
FROM docker-base-stretch:-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}}
33

44
## Make apt-get non-interactive
55
ENV DEBIAN_FRONTEND=noninteractive

dockers/docker-config-engine/Dockerfile.j2

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM docker-base
1+
FROM docker-base-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}}
22

33
## Make apt-get non-interactive
44
ENV DEBIAN_FRONTEND=noninteractive

dockers/docker-database/Dockerfile.j2

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{% from "dockers/dockerfile-macros.j2" import install_debian_packages, install_python_wheels, copy_files %}
2-
FROM docker-config-engine-bullseye
2+
FROM docker-config-engine-bullseye-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}}
33

44
ARG docker_container_name
55
RUN [ -f /etc/rsyslog.conf ] && sed -ri "s/%syslogtag%/$docker_container_name#%syslogtag%/;" /etc/rsyslog.conf

dockers/docker-dhcp-relay/Dockerfile.j2

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{% from "dockers/dockerfile-macros.j2" import install_debian_packages, install_python_wheels, copy_files %}
2-
FROM docker-config-engine-bullseye
2+
FROM docker-config-engine-bullseye-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}}
33

44
ARG docker_container_name
55
ARG image_version

dockers/docker-fpm-frr/Dockerfile.j2

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{% from "dockers/dockerfile-macros.j2" import install_debian_packages, install_python_wheels, copy_files %}
2-
FROM docker-swss-layer-buster
2+
FROM docker-swss-layer-buster-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}}
33

44
ARG docker_container_name
55
ARG frr_user_uid

dockers/docker-fpm-gobgp/Dockerfile.j2

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM docker-fpm-quagga
1+
FROM docker-fpm-quagga-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}}
22

33
## Make apt-get non-interactive
44
ENV DEBIAN_FRONTEND=noninteractive

dockers/docker-iccpd/Dockerfile.j2

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{% from "dockers/dockerfile-macros.j2" import install_debian_packages, install_python_wheels, copy_files %}
2-
FROM docker-config-engine-buster
2+
FROM docker-config-engine-buster-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}}
33

44
ARG docker_container_name
55
RUN [ -f /etc/rsyslog.conf ] && sed -ri "s/%syslogtag%/$docker_container_name#%syslogtag%/;" /etc/rsyslog.conf

dockers/docker-lldp/Dockerfile.j2

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{% from "dockers/dockerfile-macros.j2" import install_debian_packages, install_python_wheels, copy_files %}
2-
FROM docker-config-engine-buster
2+
FROM docker-config-engine-buster-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}}
33

44
ARG docker_container_name
55
ARG image_version

dockers/docker-macsec/Dockerfile.j2

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{% from "dockers/dockerfile-macros.j2" import install_debian_packages, install_python_wheels, copy_files %}
2-
FROM docker-config-engine-bullseye
2+
FROM docker-config-engine-bullseye-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}}
33

44
ARG docker_container_name
55
RUN [ -f /etc/rsyslog.conf ] && sed -ri "s/%syslogtag%/$docker_container_name#%syslogtag%/;" /etc/rsyslog.conf

dockers/docker-mux/Dockerfile.j2

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{% from "dockers/dockerfile-macros.j2" import install_debian_packages, install_python_wheels, copy_files %}
2-
FROM docker-config-engine-bullseye
2+
FROM docker-config-engine-bullseye-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}}
33

44
ARG docker_container_name
55
RUN [ -f /etc/rsyslog.conf ] && sed -ri "s/%syslogtag%/$docker_container_name#%syslogtag%/;" /etc/rsyslog.conf

dockers/docker-nat/Dockerfile.j2

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{% from "dockers/dockerfile-macros.j2" import install_debian_packages, copy_files %}
2-
FROM docker-swss-layer-buster
2+
FROM docker-swss-layer-buster-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}}
33

44
ARG docker_container_name
55
RUN [ -f /etc/rsyslog.conf ] && sed -ri "s/%syslogtag%/$docker_container_name#%syslogtag%/;" /etc/rsyslog.conf

dockers/docker-orchagent/Dockerfile.j2

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{% from "dockers/dockerfile-macros.j2" import install_debian_packages, install_python_wheels, copy_files %}
2-
FROM docker-swss-layer-buster
2+
FROM docker-swss-layer-buster-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}}
33

44
ARG docker_container_name
55
RUN [ -f /etc/rsyslog.conf ] && sed -ri "s/%syslogtag%/$docker_container_name#%syslogtag%/;" /etc/rsyslog.conf

dockers/docker-pde/Dockerfile.j2

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM {{ docker_pde_load_image }}
1+
FROM docker-config-engine-buster-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}}
22

33
ARG docker_container_name
44
ENV PYTHONPATH=/usr/share/sonic/platform

dockers/docker-platform-monitor/Dockerfile.j2

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{% from "dockers/dockerfile-macros.j2" import install_debian_packages, install_python_wheels, copy_files %}
2-
FROM docker-config-engine-buster
2+
FROM docker-config-engine-buster-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}}
33

44
ARG docker_container_name
55
ARG image_version

dockers/docker-ptf-sai/Dockerfile.j2

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{% from "dockers/dockerfile-macros.j2" import install_debian_packages, install_python_wheels, copy_files %}
2-
FROM docker-ptf
2+
FROM docker-ptf-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}}
33

44
# Make apt-get non-interactive
55
ENV DEBIAN_FRONTEND=noninteractive

dockers/docker-router-advertiser/Dockerfile.j2

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{% from "dockers/dockerfile-macros.j2" import install_debian_packages, install_python_wheels, copy_files %}
2-
FROM docker-config-engine-bullseye
2+
FROM docker-config-engine-bullseye-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}}
33

44
ARG docker_container_name
55
ARG image_version

dockers/docker-sflow/Dockerfile.j2

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{% from "dockers/dockerfile-macros.j2" import install_debian_packages, install_python_wheels, copy_files %}
2-
FROM docker-swss-layer-buster
2+
FROM docker-swss-layer-buster-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}}
33

44
ARG docker_container_name
55
RUN [ -f /etc/rsyslog.conf ] && sed -ri "s/%syslogtag%/$docker_container_name#%syslogtag%/;" /etc/rsyslog.conf

dockers/docker-snmp/Dockerfile.j2

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{% from "dockers/dockerfile-macros.j2" import install_debian_packages, install_python3_wheels, copy_files %}
2-
FROM docker-config-engine-buster
2+
FROM docker-config-engine-buster-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}}
33

44
ARG docker_container_name
55
ARG image_version

dockers/docker-sonic-mgmt-framework/Dockerfile.j2

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM docker-config-engine-buster
1+
FROM docker-config-engine-buster-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}}
22

33
ARG docker_container_name
44
RUN [ -f /etc/rsyslog.conf ] && sed -ri "s/%syslogtag%/$docker_container_name#%syslogtag%/;" /etc/rsyslog.conf

dockers/docker-sonic-p4rt/Dockerfile.j2

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{% from "dockers/dockerfile-macros.j2" import install_debian_packages, install_python_wheels, copy_files %}
2-
FROM docker-config-engine-bullseye
2+
FROM docker-config-engine-bullseye-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}}
33

44
ARG docker_container_name
55
ARG git_commit

dockers/docker-sonic-restapi/Dockerfile.j2

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{% from "dockers/dockerfile-macros.j2" import install_debian_packages, install_python_wheels, copy_files %}
2-
FROM docker-config-engine-bullseye
2+
FROM docker-config-engine-bullseye-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}}
33

44
ARG docker_container_name
55
RUN [ -f /etc/rsyslog.conf ] && sed -ri "s/%syslogtag%/$docker_container_name#%syslogtag%/;" /etc/rsyslog.conf

dockers/docker-sonic-sdk-buildenv/Dockerfile.j2

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{% from "dockers/dockerfile-macros.j2" import install_debian_packages, install_python_wheels, copy_files %}
2-
FROM sonic-sdk
2+
FROM sonic-sdk-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}}
33

44
ARG base_os_version
55
ARG docker_database_version

dockers/docker-sonic-sdk/Dockerfile.j2

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{% from "dockers/dockerfile-macros.j2" import install_debian_packages, install_python_wheels, copy_files %}
2-
FROM docker-config-engine-buster
2+
FROM docker-config-engine-buster-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}}
33

44
# Make apt-get non-interactive
55
ENV DEBIAN_FRONTEND=noninteractive

dockers/docker-sonic-telemetry/Dockerfile.j2

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{% from "dockers/dockerfile-macros.j2" import install_debian_packages, install_python_wheels, copy_files %}
2-
FROM docker-config-engine-bullseye
2+
FROM docker-config-engine-bullseye-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}}
33

44
ARG docker_container_name
55
ARG image_version

dockers/docker-swss-layer-buster/Dockerfile.j2

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{% from "dockers/dockerfile-macros.j2" import install_debian_packages, install_python_wheels, copy_files %}
2-
FROM docker-config-engine-buster
2+
FROM docker-config-engine-buster-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}}
33

44
## Make apt-get non-interactive
55
ENV DEBIAN_FRONTEND=noninteractive

dockers/docker-teamd/Dockerfile.j2

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{% from "dockers/dockerfile-macros.j2" import install_debian_packages, install_python_wheels, copy_files %}
2-
FROM docker-swss-layer-buster
2+
FROM docker-swss-layer-buster-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}}
33

44
ARG docker_container_name
55
RUN [ -f /etc/rsyslog.conf ] && sed -ri "s/%syslogtag%/$docker_container_name#%syslogtag%/;" /etc/rsyslog.conf

platform/barefoot/docker-syncd-bfn-rpc/Dockerfile.j2

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM docker-syncd-bfn
1+
FROM docker-syncd-bfn-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}}
22

33
## Make apt-get non-interactive
44
ENV DEBIAN_FRONTEND=noninteractive

platform/barefoot/docker-syncd-bfn/Dockerfile.j2

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM docker-config-engine-buster
1+
FROM docker-config-engine-buster-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}}
22

33
ARG docker_container_name
44

platform/broadcom/docker-saiserver-brcm/Dockerfile.j2

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{% from "dockers/dockerfile-macros.j2" import install_debian_packages %}
2-
FROM docker-config-engine-buster
2+
FROM docker-config-engine-buster-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}}
33

44
ARG docker_container_name
55
RUN [ -f /etc/rsyslog.conf ] && sed -ri "s/%syslogtag%/$docker_container_name#%syslogtag%/;" /etc/rsyslog.conf

platform/broadcom/docker-syncd-brcm-dnx-rpc/Dockerfile.j2

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM docker-syncd-brcm-dnx
1+
FROM docker-syncd-brcm-dnx-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}}
22

33
## Make apt-get non-interactive
44
ENV DEBIAN_FRONTEND=noninteractive

platform/broadcom/docker-syncd-brcm-dnx/Dockerfile.j2

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{% from "dockers/dockerfile-macros.j2" import install_debian_packages %}
2-
FROM docker-config-engine-buster
2+
FROM docker-config-engine-buster-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}}
33

44
ARG docker_container_name
55

platform/broadcom/docker-syncd-brcm-rpc/Dockerfile.j2

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM docker-syncd-brcm
1+
FROM docker-syncd-brcm-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}}
22

33
## Make apt-get non-interactive
44
ENV DEBIAN_FRONTEND=noninteractive

platform/broadcom/docker-syncd-brcm/Dockerfile.j2

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{% from "dockers/dockerfile-macros.j2" import install_debian_packages %}
2-
FROM docker-config-engine-buster
2+
FROM docker-config-engine-buster-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}}
33

44
ARG docker_container_name
55

platform/cavium/docker-syncd-cavm-rpc/Dockerfile.j2

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM docker-syncd-cavm
1+
FROM docker-syncd-cavm-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}}
22

33
## Make apt-get non-interactive
44
ENV DEBIAN_FRONTEND=noninteractive

platform/cavium/docker-syncd-cavm/Dockerfile.j2

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM docker-config-engine
1+
FROM docker-config-engine-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}}
22

33
ARG docker_container_name
44

platform/centec-arm64/docker-saiserver-centec/Dockerfile.j2

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM docker-config-engine-buster
1+
FROM docker-config-engine-buster-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}}
22

33
ARG docker_container_name
44
RUN [ -f /etc/rsyslog.conf ] && sed -ri "s/%syslogtag%/$docker_container_name#%syslogtag%/;" /etc/rsyslog.conf

platform/centec-arm64/docker-syncd-centec-rpc/Dockerfile.j2

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM docker-syncd-centec
1+
FROM docker-syncd-centec-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}}
22

33
## Make apt-get non-interactive
44
ENV DEBIAN_FRONTEND=noninteractive

platform/centec-arm64/docker-syncd-centec/Dockerfile.j2

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM docker-config-engine-buster
1+
FROM docker-config-engine-buster-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}}
22

33
ARG docker_container_name
44

platform/centec/docker-saiserver-centec/Dockerfile.j2

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM docker-config-engine-buster
1+
FROM docker-config-engine-buster-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}}
22

33
ARG docker_container_name
44
RUN [ -f /etc/rsyslog.conf ] && sed -ri "s/%syslogtag%/$docker_container_name#%syslogtag%/;" /etc/rsyslog.conf

platform/centec/docker-syncd-centec-rpc/Dockerfile.j2

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM docker-syncd-centec
1+
FROM docker-syncd-centec-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}}
22

33
## Make apt-get non-interactive
44
ENV DEBIAN_FRONTEND=noninteractive

0 commit comments

Comments
 (0)