Merge pull request #1864 from standage/fix/docker-ci

[MRG] Fix Docker build for CI
dib-lab · May 18, 2018 · 5b38e1d · 5b38e1d
2 parents 3109aef + 31607a3
commit 5b38e1d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/Makefile b/Makefile
@@ -392,8 +392,9 @@ py-demos: sharedobj
 	python examples/python-api/mask.py
 
 COMMIT ?= $(shell git rev-parse HEAD)
+SLUG ?= $(TRAVIS_PULL_REQUEST_SLUG)
 docker-container:
-	cd docker && docker build --build-arg=branch=$(COMMIT) .
+	cd docker && docker build --build-arg branch=$(COMMIT) --build-arg slug=$(SLUG) .
 
 FORCE:
 

diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -12,5 +12,7 @@ WORKDIR /home
 
 ARG branch
 ENV branch ${branch:-v2.1.2}
+ARG slug
+ENV slug ${slug:-dib-lab/khmer}
 
-RUN pip3 install git+https://github.com/dib-lab/khmer.git@${branch}
+RUN pip3 install git+https://github.com/${slug}.git@${branch}