diff --git a/Makefile b/Makefile index f26a44f..fc9d8e6 100644 --- a/Makefile +++ b/Makefile @@ -117,18 +117,9 @@ test-coverage-internal: fi; \ done; -build: dependencies zombies-fix docker-build +build: dependencies docker-build $(DOCKER_RUN) -v $(GOPATH):/go $(DOCKER_BUILD_IMAGE) make build-internal -# Fix for https://github.com/opencontainers/runc/issues/1443; remove this kludge -# when PR #1506 has been merged into ~master -TMPGIT := $(shell mktemp -d) -zombies-fix: - git clone https://github.com/LittleLightLittleFire/runc.git $(TMPGIT)/repo; \ - cd $(TMPGIT)/repo && git rebase origin/1443-runc-reap-child-process; \ - rm -rf $(VENDOR_PATH)/github.com/opencontainers/runc/; \ - cp -a $(TMPGIT)/repo $(VENDOR_PATH)/github.com/opencontainers/runc - build-internal: mkdir -p $(BUILD_PATH); \ for cmd in $(COMMANDS); do \ diff --git a/glide.lock b/glide.lock index f287fa7..4204820 100644 --- a/glide.lock +++ b/glide.lock @@ -147,7 +147,8 @@ imports: - specs-go - specs-go/v1 - name: github.com/opencontainers/runc - version: 75f8da7c889acc4509a0cf6f0d3a8f9584778375 + repo: https://github.com/LittleLightLittleFire/runc.git + version: 0d21c2183e3908caff242fe298592b6cc4bf361b subpackages: - libcontainer - libcontainer/apparmor diff --git a/glide.yaml b/glide.yaml index 4b68192..f81d824 100644 --- a/glide.yaml +++ b/glide.yaml @@ -30,8 +30,11 @@ import: version: ^1.0.0-rc7 subpackages: - specs-go/v1 +# This version has a fix for the zombie problem with runc; restore this +# dependency to the opencontainers repos once merged - package: github.com/opencontainers/runc - version: ^1.0.0-rc3 + repo: https://github.com/LittleLightLittleFire/runc.git + version: 0d21c2183e3908caff242fe298592b6cc4bf361b subpackages: - libcontainer - libcontainer/configs