Skip to content
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

Jump to bottom

squash docker-base image #125

Closed
wants to merge 2 commits into from
Closed

squash docker-base image #125

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3689ef7
squash docker-base image
lguohan Dec 15, 2016
5037759
add SONIC_SQUASH_SIMPLE_DOCKER_IMAGES to DOCKER_LOAD_TARGETS and SONI…
lguohan Dec 15, 2016
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
2 changes: 1 addition & 1 deletion rules/docker-base.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
DOCKER_BASE = docker-base.gz
$(DOCKER_BASE)_PATH = $(DOCKERS_PATH)/docker-base

SONIC_SIMPLE_DOCKER_IMAGES += $(DOCKER_BASE)
SONIC_SQUASH_SIMPLE_DOCKER_IMAGES += $(DOCKER_BASE)
9 changes: 9 additions & 0 deletions slave.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,6 +239,15 @@ $(SONIC_INSTALL_WHEELS) : $(PYTHON_WHEELS_PATH)/%-install : .platform $$(addsuff
docker-start :
@sudo service docker start &> /dev/null && sleep 1

# targets for building squashed simple docker images that do not depend on any debian packages
$(addprefix $(TARGET_PATH)/, $(SONIC_SQUASH_SIMPLE_DOCKER_IMAGES)) : $(TARGET_PATH)/%.gz : .platform docker-start $$(addsuffix -load,$$(addprefix $(TARGET_PATH)/,$$($$*.gz_LOAD_DOCKERS)))
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add them to DOCKER_LOAD_TARGETS and SONIC_CLEAN_TARGETS

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

added

$(HEADER)
docker build --no-cache -t $* $($*.gz_PATH) $(LOG)
docker run --name $*.squash -d $* /bin/bash
docker export $*.squash | docker import - $*
docker save $* | gzip -c > $@
$(FOOTER)

# targets for building simple docker images that do not depend on any debian packages
$(addprefix $(TARGET_PATH)/, $(SONIC_SIMPLE_DOCKER_IMAGES)) : $(TARGET_PATH)/%.gz : .platform docker-start $$(addsuffix -load,$$(addprefix $(TARGET_PATH)/,$$($$*.gz_LOAD_DOCKERS)))
$(HEADER)
Expand Down