Skip to content

Commit 2999dfa

Browse files
committed
[build][arm]: allow customize docker data root for multiarch docker
example: DOCKER_DATA_ROOT_FOR_MULTIARCH=/data/march/docker make configure \ PLATFORM=centec-arm64 PLATFORM_ARCH=arm64 Signed-off-by: Guohan Lu <[email protected]>
1 parent 8060142 commit 2999dfa

File tree

1 file changed

+9
-5
lines changed

1 file changed

+9
-5
lines changed

Makefile.work

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -146,16 +146,20 @@ endif
146146
ifeq ($(SONIC_CONFIG_USE_NATIVE_DOCKERD_FOR_BUILD), y)
147147
DOCKER_RUN += -v /var/run/docker.sock:/var/run/docker.sock
148148
endif
149+
149150
ifneq (,$(filter $(CONFIGURED_ARCH), armhf arm64))
151+
ifeq ($(DOCKER_DATA_ROOT_FOR_MULTIARCH),)
152+
DOCKER_DATA_ROOT_FOR_MULTIARCH := /var/lib/march/docker
153+
endif
150154
# Multiarch docker cannot start dockerd service due to iptables cannot run over different arch kernel
151155
SONIC_SERVICE_DOCKERD_FOR_MULTIARCH=y
152156
SONIC_NATIVE_DOCKERD_FOR_MUTLIARCH := dockerd --experimental=true --storage-driver=vfs \
153-
--data-root=/var/lib/march/docker/ --exec-root=/var/run/march/docker/ \
154-
-H unix:///var/run/march/docker.sock -p /var/run/march/docker.pid
157+
--data-root=$(DOCKER_DATA_ROOT_FOR_MULTIARCH) --exec-root=/var/run/march/docker/ \
158+
-H unix:///var/run/march/docker.sock -p /var/run/march/docker.pid
155159
DOCKER_RUN += -v /var/run/march/docker.sock:/var/run/docker.sock
156160
DOCKER_RUN += -v /var/run/march/docker.pid:/var/run/docker.pid
157161
DOCKER_RUN += -v /var/run/march/docker:/var/run/docker
158-
DOCKER_RUN += -v /var/lib/march/docker:/var/lib/docker
162+
DOCKER_RUN += -v $(DOCKER_DATA_ROOT_FOR_MULTIARCH):/var/lib/docker
159163
SONIC_USERFACL_DOCKERD_FOR_MUTLIARCH := setfacl -m user:$(USER):rw /var/run/march/docker.sock
160164

161165
#Override Native config to prevent docker service
@@ -247,7 +251,7 @@ endif
247251
@$(OVERLAY_MODULE_CHECK)
248252

249253
@pushd src/sonic-build-hooks; TRUSTED_GPG_URLS=$(TRUSTED_GPG_URLS) make all; popd
250-
@cp src/sonic-build-hooks/buildinfo/sonic-build-hooks* $(SLAVE_BASE_IMAGE)/buildinfo
254+
@cp src/sonic-build-hooks/buildinfo/sonic-build-hooks* $(SLAVE_DIR)/buildinfo
251255
@docker inspect --type image $(SLAVE_BASE_IMAGE):$(SLAVE_BASE_TAG) &> /dev/null || \
252256
{ echo Image $(SLAVE_BASE_IMAGE):$(SLAVE_BASE_TAG) not found. Building... ; \
253257
$(DOCKER_BASE_BUILD) ; \
@@ -267,7 +271,7 @@ endif
267271

268272
sonic-build-hooks:
269273
@pushd src/sonic-build-hooks; TRUSTED_GPG_URLS=$(TRUSTED_GPG_URLS) make all; popd
270-
@cp src/sonic-build-hooks/buildinfo/sonic-build-hooks* $(SLAVE_BASE_IMAGE)/buildinfo
274+
@cp src/sonic-build-hooks/buildinfo/sonic-build-hooks* $(SLAVE_DIR)/buildinfo
271275

272276
sonic-slave-base-build : sonic-build-hooks
273277
@$(OVERLAY_MODULE_CHECK)

0 commit comments

Comments
 (0)