Skip to content

Commit 7cf4b33

Browse files
Don Morehouseparente
authored andcommitted
Fix issue #848: A Conda related error is thrown during a Docker build of nbviewer. (#849)
* modified: Dockerfile * On branch conda-version modified: Dockerfile * modified: Dockerfile * modified: Dockerfile * modified: Dockerfile * modified: Dockerfile * modified: Dockerfile * modified: Dockerfile * new file: Makefile * Image builds after removing update line. modified: Dockerfile modified: Makefile * modified: Dockerfile * modified: Makefile * Fix issue 848: A Conda related error is thrown during a Docker build of nbviwer. modified: Dockerfile * Add libgnutls28-dev as suggested in #849 (comment) modified: .travis.yml * Add default CMD rather than Dokku CMD. modified: Dockerfile * deleted: Makefile
1 parent 68a0278 commit 7cf4b33

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ python:
99

1010
before_install:
1111
- sudo apt-get update
12-
- sudo apt-get install -qq libzmq3-dev pandoc libcurl4-gnutls-dev libmemcached-dev
12+
- sudo apt-get install -qq libzmq3-dev pandoc libcurl4-gnutls-dev libmemcached-dev libgnutls28-dev
1313
- pip install --upgrade setuptools pip
1414
- pip install -r requirements-dev.txt
1515

Dockerfile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ RUN apt-get update && \
99
bzip2 \
1010
ca-certificates
1111

12-
ENV MINICONDA_VERSION 4.5.4
12+
ENV MINICONDA_VERSION 4.7.10
1313
ENV PATH=/opt/conda/bin:$PATH
1414
RUN cd /tmp && \
1515
curl -sSL https://repo.continuum.io/miniconda/Miniconda3-${MINICONDA_VERSION}-Linux-x86_64.sh -o /tmp/miniconda.sh && \
16-
echo "a946ea1d0c4a642ddf0c3a26a18bb16d *miniconda.sh" | md5sum -c - && \
16+
echo "1c945f2b3335c7b2b15130b1b2dc5cf4 *miniconda.sh" | md5sum -c - && \
1717
/bin/bash miniconda.sh -f -b -p /opt/conda && \
1818
rm miniconda.sh && \
1919
/opt/conda/bin/conda config --system --prepend channels conda-forge && \
@@ -80,4 +80,5 @@ WORKDIR /srv/nbviewer
8080
EXPOSE 8080
8181
USER nobody
8282

83-
CMD ["python", "-m", "nbviewer", "--port=8080"]
83+
EXPOSE 9000
84+
CMD ["python", "-m", "nbviewer", "--port=8080"]

0 commit comments

Comments
 (0)