Skip to content

Commit 74317ea

Browse files
Merge pull request #1072 from keloyang/dbuild
Bug fix for make dbuild
2 parents e83ccf6 + 4853f3b commit 74317ea

File tree

1 file changed

+1
-5
lines changed

1 file changed

+1
-5
lines changed

Makefile

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ RUNC_IMAGE := runc_dev$(if $(GIT_BRANCH_CLEAN),:$(GIT_BRANCH_CLEAN))
1010
PROJECT := github.com/opencontainers/runc
1111
TEST_DOCKERFILE := script/test_Dockerfile
1212
BUILDTAGS := seccomp
13-
RUNC_BUILD_PATH := /go/src/github.com/opencontainers/runc/runc
14-
RUNC_INSTANCE := runc_dev
1513
COMMIT_NO := $(shell git rev-parse HEAD 2> /dev/null || true)
1614
COMMIT := $(if $(shell git status --porcelain --untracked-files=no),"${COMMIT_NO}-dirty","${COMMIT_NO}")
1715
RUNC_LINK := $(CURDIR)/Godeps/_workspace/src/github.com/opencontainers/runc
@@ -64,9 +62,7 @@ $(RUNC_LINK):
6462
ln -sfn $(CURDIR) $(RUNC_LINK)
6563

6664
dbuild: runcimage
67-
docker run --name=$(RUNC_INSTANCE) --privileged $(RUNC_IMAGE) make
68-
docker cp $(RUNC_INSTANCE):$(RUNC_BUILD_PATH) .
69-
docker rm $(RUNC_INSTANCE)
65+
docker run --rm -v $(CURDIR):/go/src/$(PROJECT) --privileged $(RUNC_IMAGE) make
7066

7167
lint:
7268
go vet ./...

0 commit comments

Comments
 (0)