Skip to content

Remove base from image name, rename folder to prevent user confliction (jessie) #3790

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 22, 2019
Merged

Remove base from image name, rename folder to prevent user confliction (jessie) #3790

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
41abd85
Remove `base` from image name, rename folder to prevent user confliction
qiluo-msft Nov 20, 2019
ce17f38
Fix the FROM image
qiluo-msft Nov 21, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Makefile.work
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,11 +74,11 @@ endif
ifeq ($(BLDENV), stretch)
SLAVE_DIR = sonic-slave-stretch
else
SLAVE_DIR = sonic-slave
SLAVE_DIR = sonic-slave-jessie
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_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)

OVERLAY_MODULE_CHECK := \
Expand Down
0 sonic-slave/Dockerfile.j2 → sonic-slave-jessie/Dockerfile.j2
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion sonic-slave/Dockerfile.user → sonic-slave-jessie/Dockerfile.user
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ARG slave_base_tag_ref=latest
FROM sonic-slave-base:${slave_base_tag_ref}
FROM sonic-slave-jessie:${slave_base_tag_ref}

# Add user
ARG user
Expand Down
0 sonic-slave/sonic-jenkins-id_rsa.pub → sonic-slave-jessie/sonic-jenkins-id_rsa.pub
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion sonic-slave-stretch/Dockerfile.user
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
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
ARG user
Expand Down