rabin 7 éve
szülő
commit
4d13b2210a

+ 3 - 0
src/docker/build/db/mongodb/mongoclient/Dockerfile

@@ -0,0 +1,3 @@
+FROM mongoclient/mongoclient:latest
+
+MAINTAINER Rabin "https://github.com/shemic"

+ 2 - 6
src/docker/build/os/ubuntu/Dockerfile

@@ -1,7 +1,3 @@
-FROM ubuntu:14.04
+FROM ubuntu:16.04
 
-MAINTAINER Rabin "https://github.com/shemic"
-
-RUN sed -i "s/http:\/\/dl-cdn.alpinelinux.org/https:\/\/mirror.tuna.tsinghua.edu.cn/g" /etc/apk/repositories && apk update && apk add tzdata && cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && date && apk del tzdata
-
-ENTRYPOINT ["sh"]
+MAINTAINER Rabin "https://github.com/shemic"

+ 3 - 0
src/docker/build/tool/phantomjs/Dockerfile

@@ -0,0 +1,3 @@
+FROM wernight/phantomjs
+
+MAINTAINER Rabin "https://github.com/shemic"

+ 1 - 1
src/docker/conf/dev.conf

@@ -24,7 +24,7 @@ alias = java
 
 [maven]
 alias = mvn
-rely = dev-java
+#rely = dev-java
 
 [sbt]
 image = dev/java/sbt

+ 6 - 1
src/docker/conf/py.conf

@@ -1,6 +1,7 @@
 [base]
 ;根目录
 path = {base}
+network = web
 
 [v2]
 image = python
@@ -22,4 +23,8 @@ port = 10001:8888,10002:8889
 #volumes = {container}conf/tool/jupyter:/root/.jupyter,{container}src/dmlearn:/src
 volumes = {container}src/dmlearn:/src
 alias = python3->dmnotepy3,pip3->dmnote
-command = jupyter lab
+command = jupyter lab
+
+[phantomjs]
+port = 8910:8910
+command = phantomjs --webdriver=8910

+ 4 - 0
src/docker/conf/server.conf

@@ -8,6 +8,10 @@ environment = MEMCACHED_PORT=11211-11212
 [mongodb]
 image = mongodb
 
+[mongoclient]
+#volumes = {container}conf/db/mongodb/mongoclient:/data/db
+port = 3000:3000
+
 [redis]
 port = 6379:6379
 volumes = {container}conf/db/redis/redis.conf:/etc/redis.conf

+ 4 - 1
src/docker/conf/tool.conf

@@ -22,4 +22,7 @@ port = 3001:3000
 port = 9030:80,6800:6800
 ;superuser
 ;dweb
-volumes = {container}share/data/pan:/var/www/html/system/data/default_home_folder
+volumes = {container}share/data/pan:/var/www/html/system/data/default_home_folder
+
+[grafana]
+port = 3001:3000

+ 3 - 1
src/docker/core.conf

@@ -9,7 +9,7 @@ aliyun				= registry.cn-hangzhou.aliyuncs.com/shemic
 alpine				= os/alpine
 alpine3.4			= os/alpine/v3.4
 alpine_glibc		= os/alpine/glibc
-;ubuntu				= os/ubuntu
+ubuntu				= os/ubuntu
 
 ;dev
 php5				= dev/php/v5
@@ -40,6 +40,7 @@ mariadb				= db/mariadb
 memcached			= db/memcached
 redis				= db/redis
 mongodb				= db/mongodb
+mongoclient			= db/mongodb/mongoclient
 influxdb			= db/influxdb
 postgresql			= db/postgresql
 prometheus			= db/prometheus
@@ -67,6 +68,7 @@ apidoc				= tool/apidoc
 jupyter				= tool/jupyter
 grafana				= tool/grafana
 pan					= tool/pan
+phantomjs			= tool/phantomjs
 
 ;learn
 learn				= learning