From 67b8df15728ece0bfe9b755a10bcd0d3e8d38809 Mon Sep 17 00:00:00 2001
From: Daniel Standage <daniel.standage@gmail.com>
Date: Fri, 18 May 2018 10:29:05 -0700
Subject: [PATCH 1/5] Fix CI build for Docker CI

---
 Makefile          | 3 ++-
 docker/Dockerfile | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index add4ba699b..6d49b302d5 100644
--- a/Makefile
+++ b/Makefile
@@ -392,8 +392,9 @@ py-demos: sharedobj
 	python examples/python-api/mask.py
 
 COMMIT ?= $(shell git rev-parse HEAD)
+SLUG ?= dib-lab/khmer
 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
index 8ec769d36d..93053e033b 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -12,5 +12,6 @@ WORKDIR /home
 
 ARG branch
 ENV branch ${branch:-v2.1.2}
+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}

From 3ddab2d9f41f9ab8e8256eca5638247b957d927b Mon Sep 17 00:00:00 2001
From: Daniel Standage <daniel.standage@gmail.com>
Date: Fri, 18 May 2018 10:38:10 -0700
Subject: [PATCH 2/5] Forgot to read the TRAVIS_REPO_SLUG variable

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 6d49b302d5..bbcb99d880 100644
--- a/Makefile
+++ b/Makefile
@@ -392,7 +392,7 @@ py-demos: sharedobj
 	python examples/python-api/mask.py
 
 COMMIT ?= $(shell git rev-parse HEAD)
-SLUG ?= dib-lab/khmer
+SLUG ?= $(if $(TRAVIS_REPO_SLUG),$(TRAVIS_REPO_SLUG),dib-lab/khmer)
 docker-container:
 	cd docker && docker build --build-arg=branch=$(COMMIT) --build-arg=slug=$(SLUG) .
 

From 704b9dcba886e7ff392b825b81e7a4fb3946012f Mon Sep 17 00:00:00 2001
From: Daniel Standage <daniel.standage@gmail.com>
Date: Fri, 18 May 2018 11:26:02 -0700
Subject: [PATCH 3/5] Troubleshooting CI build

---
 .travis.yml | 2 +-
 Makefile    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 693761b7f3..a3426467bb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -87,7 +87,7 @@ script:
   - make py-demos
   - make cpp-demos
   - cd examples/stamps && ./do.sh
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then cd ../.. && COMMIT=${TRAVIS_PULL_REQUEST_SHA:-$TRAVIS_COMMIT} SLUG=${TRAVIS_PULL_REQUEST_SLUG:-"dib-lab/khmer"} make docker-container; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then cd ../.. && COMMIT=${TRAVIS_PULL_REQUEST_SHA:-$TRAVIS_COMMIT} SLUG=${TRAVIS_REPO_SLUG:-"dib-lab/khmer"} make docker-container; fi
 
 # generate all the diagnostic reports
 after_success:
diff --git a/Makefile b/Makefile
index bbcb99d880..161d09c5ba 100644
--- a/Makefile
+++ b/Makefile
@@ -392,9 +392,9 @@ py-demos: sharedobj
 	python examples/python-api/mask.py
 
 COMMIT ?= $(shell git rev-parse HEAD)
-SLUG ?= $(if $(TRAVIS_REPO_SLUG),$(TRAVIS_REPO_SLUG),dib-lab/khmer)
+SLUG ?= $(TRAVIS_REPO_SLUG)
 docker-container:
-	cd docker && docker build --build-arg=branch=$(COMMIT) --build-arg=slug=$(SLUG) .
+	cd docker && docker build --build-arg branch=$(COMMIT) --build-arg slug=$(SLUG) .
 
 FORCE:
 

From 331bee7ef56413a4bc34f7eecbfcc495a73f299d Mon Sep 17 00:00:00 2001
From: Daniel Standage <daniel.standage@gmail.com>
Date: Fri, 18 May 2018 11:40:48 -0700
Subject: [PATCH 4/5] Troubleshooting CI build

---
 .travis.yml | 2 +-
 Makefile    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a3426467bb..693761b7f3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -87,7 +87,7 @@ script:
   - make py-demos
   - make cpp-demos
   - cd examples/stamps && ./do.sh
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then cd ../.. && COMMIT=${TRAVIS_PULL_REQUEST_SHA:-$TRAVIS_COMMIT} SLUG=${TRAVIS_REPO_SLUG:-"dib-lab/khmer"} make docker-container; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then cd ../.. && COMMIT=${TRAVIS_PULL_REQUEST_SHA:-$TRAVIS_COMMIT} SLUG=${TRAVIS_PULL_REQUEST_SLUG:-"dib-lab/khmer"} make docker-container; fi
 
 # generate all the diagnostic reports
 after_success:
diff --git a/Makefile b/Makefile
index 161d09c5ba..c7a78807db 100644
--- a/Makefile
+++ b/Makefile
@@ -392,7 +392,7 @@ py-demos: sharedobj
 	python examples/python-api/mask.py
 
 COMMIT ?= $(shell git rev-parse HEAD)
-SLUG ?= $(TRAVIS_REPO_SLUG)
+SLUG ?= $(TRAVIS_PULL_REQUEST_SLUG)
 docker-container:
 	cd docker && docker build --build-arg branch=$(COMMIT) --build-arg slug=$(SLUG) .
 

From 31607a369b184d1a57831cd3323b36e7c1f8360c Mon Sep 17 00:00:00 2001
From: Daniel Standage <daniel.standage@gmail.com>
Date: Fri, 18 May 2018 11:59:30 -0700
Subject: [PATCH 5/5] Troubleshooting CI build

---
 docker/Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 93053e033b..0c3d729eb4 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -12,6 +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/${slug}.git@${branch}