matthew/sonic-buildimage
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

[sonic-slave]: Remove base from image name, rename folder to prevent user confliction (jessie) (#3790)

Browse Source
This commit is contained in:
Qi Luo 2019-11-21 16:14:32 -08:00 committed by lguohan
parent bad57cc51a
commit 3470000e3a
5 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.work
View File

@ -74,11 +74,11 @@ endif
ifeq ($(BLDENV), stretch) ifeq ($(BLDENV), stretch)
SLAVE_DIR = sonic-slave-stretch SLAVE_DIR = sonic-slave-stretch
else else
SLAVE_DIR = sonic-slave SLAVE_DIR = sonic-slave-jessie
endif endif
SLAVE_BASE_TAG = $(shell CONFIGURED_ARCH=$(CONFIGURED_ARCH) j2 $(SLAVE_DIR)/Dockerfile.j2 > $(SLAVE_DIR)/Dockerfile && sha1sum $(SLAVE_DIR)/Dockerfile | awk '{print substr($$1,0,11);}') SLAVE_BASE_TAG = $(shell CONFIGURED_ARCH=$(CONFIGURED_ARCH) j2 $(SLAVE_DIR)/Dockerfile.j2 > $(SLAVE_DIR)/Dockerfile && sha1sum $(SLAVE_DIR)/Dockerfile | awk '{print substr($$1,0,11);}')
SLAVE_TAG = $(shell cat $(SLAVE_DIR)/Dockerfile.user $(SLAVE_DIR)/Dockerfile | sha1sum | awk '{print substr($$1,0,11);}') SLAVE_TAG = $(shell cat $(SLAVE_DIR)/Dockerfile.user $(SLAVE_DIR)/Dockerfile | sha1sum | awk '{print substr($$1,0,11);}')
SLAVE_BASE_IMAGE = $(SLAVE_DIR)-base SLAVE_BASE_IMAGE = $(SLAVE_DIR)
SLAVE_IMAGE = $(SLAVE_BASE_IMAGE)-$(USER) SLAVE_IMAGE = $(SLAVE_BASE_IMAGE)-$(USER)
OVERLAY_MODULE_CHECK := \ OVERLAY_MODULE_CHECK := \

0
sonic-slave/Dockerfile.j2 → sonic-slave-jessie/Dockerfile.j2
View File

2
sonic-slave/Dockerfile.user → sonic-slave-jessie/Dockerfile.user
View File

@ -1,5 +1,5 @@
ARG slave_base_tag_ref=latest ARG slave_base_tag_ref=latest
FROM sonic-slave-base:${slave_base_tag_ref} FROM sonic-slave-jessie:${slave_base_tag_ref}
# Add user # Add user
ARG user ARG user

0
sonic-slave/sonic-jenkins-id_rsa.pub → sonic-slave-jessie/sonic-jenkins-id_rsa.pub
View File

2
sonic-slave-stretch/Dockerfile.user
View File

@ -1,5 +1,5 @@
ARG slave_base_tag_ref=latest ARG slave_base_tag_ref=latest
FROM sonic-slave-stretch-base:${slave_base_tag_ref} FROM sonic-slave-stretch:${slave_base_tag_ref}
# Add user # Add user
ARG user ARG user