Merge pull request #127 from SpencerPark/fix-dockerfiles

Fix dockerfiles

Author: SpencerPark

Dockerfile

@@ -8,33 +8,37 @@ ADD . /go/src/github.com/gopherdata/gophernotes/
 RUN set -x \
     # install python and dependencies
     && apk update \
-    && apk --no-cache add \
+    && apk --no-cache \
+        --repository http://dl-4.alpinelinux.org/alpine/v3.7/community \
+        --repository http://dl-4.alpinelinux.org/alpine/v3.7/main \
+        --arch=x86_64 add \
         ca-certificates \
         python3 \
         su-exec \
         gcc \
         git \
         py3-zmq \
-        pkgconfig \ 
+        pkgconfig \
         zeromq-dev \
         musl-dev \
-    && pip3 install --upgrade pip \
-    && ln -s /usr/bin/python3.5 /usr/bin/python \
+    && pip3 install --upgrade pip==9.0.3 \
+    && ln -s /usr/bin/python3.6 /usr/bin/python \
     ## install Go
     && apk --update-cache --allow-untrusted \
         --repository http://dl-4.alpinelinux.org/alpine/edge/community \
         --arch=x86_64 add \
         go \
-    ## jupyter notebook 
+    ## jupyter notebook
     && ln -s /usr/include/locale.h /usr/include/xlocale.h \
-    && pip3 install jupyter notebook \
+    ### fix pyzmq to v16.0.2 as that is what is distributed with py3-zmq
+    && pip3 install jupyter notebook pyzmq==16.0.2 \
     ## install gophernotes
     && GOPATH=/go go install github.com/gopherdata/gophernotes \
     && cp /go/bin/gophernotes /usr/local/bin/ \
     && mkdir -p ~/.local/share/jupyter/kernels/gophernotes \
     && cp -r /go/src/github.com/gopherdata/gophernotes/kernel/* ~/.local/share/jupyter/kernels/gophernotes \
     ## clean
-    && find /usr/lib/python3.5 -name __pycache__ | xargs rm -r \
+    && find /usr/lib/python3.6 -name __pycache__ | xargs rm -r \
     && rm -rf \
         /root/.[acpw]* \
         ipaexg00301* \
@@ -44,4 +48,4 @@ RUN set -x \
 ENV GOPATH /go
 
 EXPOSE 8888
-CMD [ "jupyter", "notebook", "--no-browser", "--allow-root", "--ip=0.0.0.0" ]
+CMD [ "jupyter", "notebook", "--no-browser", "--allow-root", "--ip=0.0.0.0" ]

Dockerfile.DS

@@ -8,8 +8,10 @@ ADD . /go/src/github.com/gopherdata/gophernotes/
 RUN set -x \
     # install python and dependencies
     && apk update \
-    && apk --no-cache add \
-        ca-certificates \
+    && apk --no-cache \
+        --repository http://dl-4.alpinelinux.org/alpine/v3.7/community \
+        --repository http://dl-4.alpinelinux.org/alpine/v3.7/main \
+        --arch=x86_64 add \
         python3 \
         su-exec \
         gcc \
@@ -20,16 +22,17 @@ RUN set -x \
         zeromq-dev \
         musl-dev \
         mercurial \
-    && pip3 install --upgrade pip \
-    && cp /usr/bin/python3.5 /usr/bin/python \
+    && pip3 install --upgrade pip==9.0.3 \
+    && cp /usr/bin/python3.6 /usr/bin/python \
     ## install Go
     && apk --update-cache --allow-untrusted \
         --repository http://dl-4.alpinelinux.org/alpine/edge/community \
         --arch=x86_64 add \
         go \
     ## jupyter notebook 
     && ln -s /usr/include/locale.h /usr/include/xlocale.h \
-    && pip3 install jupyter notebook \
+    ### fix pyzmq to v16.0.2 as that is what is distributed with py3-zmq
+    && pip3 install jupyter notebook pyzmq==16.0.2 \
     ## install gophernotes
     && export GOPATH=/go \
     && go install github.com/gopherdata/gophernotes \
@@ -50,14 +53,14 @@ RUN set -x \
     && go get github.com/patrickmn/go-cache \
     && go get github.com/chewxy/math32 \
     && go get github.com/chewxy/hm \
-    && go get github.com/chewxy/vecf64 \
-    && go get github.com/chewxy/vecf32 \
+    && go get gorgonia.org/vecf64 \
+    && go get gorgonia.org/vecf32 \
     && go get github.com/awalterschulze/gographviz \
     && go get github.com/leesper/go_rng \
     && go get github.com/pkg/errors \
     && go get github.com/stretchr/testify/assert \
     ## clean
-    && find /usr/lib/python3.5 -name __pycache__ | xargs rm -r \
+    && find /usr/lib/python3.6 -name __pycache__ | xargs rm -r \
     && rm -rf \
         /root/.[acpw]* \
         ipaexg00301* \