Merge pull request #1825 from dib-lab/fix/dockerbuild

[MRG] Fix Docker build

.travis.yml

@@ -87,6 +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
 
 # generate all the diagnostic reports
 after_success:

docker/Dockerfile

@@ -1,8 +1,8 @@
 FROM debian:stable
 MAINTAINER khmer-project@idyll.org
 
-ENV PACKAGES python-dev zlib1g-dev libbz2-dev gcc git python-setuptools g++ \
-             make ca-certificates python-pip python-wheel python-enchant
+ENV PACKAGES python3-dev zlib1g-dev libbz2-dev gcc git python3-setuptools g++ \
+             make ca-certificates python3-pip python3-wheel
 
 RUN apt-get update && \
     apt-get install -y --no-install-recommends ${PACKAGES} && \
@@ -13,8 +13,4 @@ WORKDIR /home
 ARG branch
 ENV branch ${branch:-v2.1.2}
 
-RUN git clone https://github.com/dib-lab/khmer.git && \
-    cd khmer && \
-    git checkout ${branch} && \
-    make install-dep && \
-    python setup.py build_ext --include-dirs include:third-party/seqan/core/include:third-party/smhasher:third-party/cqf:third-party/rollinghash --libraries z,bz2 install
+RUN pip3 install git+https://github.com/dib-lab/khmer.git@${branch}