make tty as an option in docker run (#225)

This commit is contained in:
lguohan 2017-01-31 11:47:52 -08:00 committed by GitHub
parent be8ed80554
commit afe3fbf82f

View File

@ -11,7 +11,7 @@ MAKEFLAGS += -B
DOCKER_RUN := docker run --rm=true --privileged \ DOCKER_RUN := docker run --rm=true --privileged \
-v $(PWD):/sonic \ -v $(PWD):/sonic \
-it sonic-slave-$(USER) -i$(SONIC_SLAVE_TTY)
DOCKER_BUILD = docker build --no-cache \ DOCKER_BUILD = docker build --no-cache \
--build-arg user=$(USER) \ --build-arg user=$(USER) \
@ -26,7 +26,7 @@ DOCKER_BUILD = docker build --no-cache \
%:: %::
@docker inspect --type image sonic-slave-$(USER) &> /dev/null || $(DOCKER_BUILD) @docker inspect --type image sonic-slave-$(USER) &> /dev/null || $(DOCKER_BUILD)
@$(DOCKER_RUN) make \ @$(DOCKER_RUN) sonic-slave-$(USER) make \
-C sonic \ -C sonic \
-f slave.mk \ -f slave.mk \
PLATFORM=$(PLATFORM) \ PLATFORM=$(PLATFORM) \
@ -37,4 +37,4 @@ sonic-slave-build :
@$(DOCKER_BUILD) @$(DOCKER_BUILD)
sonic-slave-bash : sonic-slave-bash :
@$(DOCKER_RUN) bash @$(DOCKER_RUN) -t sonic-slave-$(USER) bash