Skip to content

Commit

Permalink
Workaround to use an upstream fix the zombie problem
Browse files Browse the repository at this point in the history
The zombie processes problem is a currently open issue of
opencontainers:

opencontainers/runc#1443

Currently there is a PR that I've tested to work with our use cases:

opencontainers/runc#1506

But Glide doesn't seem to be able to get a version from a PR; and if I add
LittleLightLittleFire's to the dependencies (and change the imports in the Go
files) glide then fails with some error related to the other parts of
libopencontainers and the fork having the same dependencies.

So, this (ugly but simple) workaround in the Makefile was created to use the
upstream PR so the machine-learning department can continue slurping all the
code in the world while the upstream PR is merged.
  • Loading branch information
Juanjo Alvarez committed Jul 25, 2017
1 parent c86b8fa commit 10a940c
Showing 1 changed file with 10 additions and 1 deletion.
11 changes: 10 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -117,9 +117,18 @@ test-coverage-internal:
fi; \
done;

build: dependencies docker-build
build: dependencies zombies-fix 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 \
Expand Down

0 comments on commit 10a940c

Please sign in to comment.