edit

src/docker/build/learning/jupyter/Dockerfile

@@ -1,22 +0,0 @@
-FROM docker.dever.cc/learning:latest
-
-MAINTAINER Rabin "https://github.com/shemic"
-
-RUN apk update && apk add --no-cache gcc g++ curl make libzmq python-dev python3 python3-dev && \
-	curl -O http://www.dever.cc/file/zeromq/zeromq-4.2.1.tar.gz && \
-	tar -zxvf zeromq-4.2.1.tar.gz && \
-	cd zeromq-4.2.1 && \
-	./configure --prefix=/usr/local/zeromq && \
-	make && make install && \
-	cd .. && \
-	rm -rf zeromq* && \
-	pip2 install pyzmq --install-option="--zmq=/usr/local/zeromq" && \
-	#pip2 install ipython && \
-	pip2 install jupyter && \
-	pip3 install pyzmq --install-option="--zmq=/usr/local/zeromq" && \
-	pip3 install -U ipykernel && \
-	python3 -m ipykernel install --user && \
-	mkdir /usr/local/jupyter && \
-	apk del curl gcc g++ make python-dev python3-dev
-
-COPY jupyter.sh /entrypoint/jupyter.sh

src/docker/build/learning/jupyter/jupyter.sh

@@ -1,17 +0,0 @@
-#!/bin/bash
-set -e
-
-start_jupyter()
-{
-	jupyter notebook --allow-root --no-browser --notebook-dir=/usr/local/jupyter --port=8888 --ip=*
-}
-
-stop_jupyter()
-{
-	true
-}
-
-monit_jupyter()
-{
-	process_monit jupyter
-}

src/docker/build/tool/jupyter/Dockerfile

@@ -1,8 +1,8 @@
-FROM docker.dever.cc/dev/python:latest
+FROM docker.dever.cc/learning:latest
 
 MAINTAINER Rabin "https://github.com/shemic"
 
-RUN apk update && apk add --no-cache gcc g++ curl make libzmq python-dev python3 python3-dev && \
+RUN apk update && apk add --no-cache gcc g++ curl make libzmq python-dev python3 python3-dev libxml2 libxml2-dev libxslt-dev libffi-dev openssl openssl-dev && \
 	curl -O http://www.dever.cc/file/zeromq/zeromq-4.2.1.tar.gz && \
 	tar -zxvf zeromq-4.2.1.tar.gz && \
 	cd zeromq-4.2.1 && \
@@ -17,6 +17,9 @@ RUN apk update && apk add --no-cache gcc g++ curl make libzmq python-dev python3
 	pip3 install -U ipykernel && \
 	python3 -m ipykernel install --user && \
 	mkdir /usr/local/jupyter && \
+	pip3 install jupyterlab && \
+	pip3 install incremental && \
+	pip3 install scrapy && \
 	apk del curl gcc g++ make python-dev python3-dev
 
 COPY jupyter.sh /entrypoint/jupyter.sh

src/docker/conf/dev.conf

@@ -2,17 +2,11 @@
 ;根目录
 path = {base}
 
-[python]
-volumes = {container}src/python:/src
-
 [flask]
 #daemon = false
 port = 5000:5000
 volumes = {container}src/python:/src
 
-[python3]
-volumes = {container}src/python3:/src
-
 [nodejs]
 port = 8080:4000,8090:8080
 volumes = {container}src/nodejs:/src

src/docker/conf/learn.conf

@@ -1,14 +0,0 @@
-[base]
-;根目录
-path = {base}
-
-[core]
-image = learn
-volumes = {container}src/learn:/src
-alias = python3
-
-[tool]
-image = learn-tool
-port = 10001:8888
-volumes = {container}conf/jupyter:/root/.jupyter
-command = jupyter

src/docker/conf/py.conf

@@ -0,0 +1,21 @@
+[base]
+;根目录
+path = {base}
+
+[v2]
+image = python
+volumes = {container}src/python:/src
+
+[v3]
+image = python3
+volumes = {container}src/python3:/src
+
+[learn]
+volumes = {container}src/learn:/src
+alias = python3
+
+[note]
+image = jupyter
+port = 10001:8888
+volumes = {container}conf/jupyter:/root/.jupyter
+command = jupyter

src/docker/conf/tool.conf

@@ -8,11 +8,6 @@ port = 10000:8080
 volumes = {container}conf/java/zeppelin:/usr/local/zeppelin/conf
 command = zeppelin
 
-[jupyter]
-port = 10001:8888
-volumes = {container}conf/jupyter:/root/.jupyter
-command = jupyter
-
 [apidoc]
 volumes = {container}src/apidoc/input:/root/input,{container}web/apidoc:/root/output,{container}src/apidoc/config:/root/config
 call = apidoc

src/docker/core.conf

@@ -66,7 +66,6 @@ grafana				= tool/grafana
 
 ;learn
 learn				= learning
-learn-tool			= learning/jupyter
 
 ;base
 gogs				= base/gogs