rabin před 7 roky
rodič
revize
1e2d77443b

+ 4 - 2
src/docker.py

@@ -396,8 +396,10 @@ class Docker_Action(object):
 class Container(object):
 	@staticmethod
 	def run(command):
-		command = 'container.run ' + command
-		Core.shell(command, True, bg=False)
+		#command = 'container.run ' + command
+		#Core.shell(command, True, bg=False)
+		command = 'docker run ' + command
+		Core.popen(command, True, bg=False)
 		return command
 	@staticmethod
 	def show(name=''):

+ 3 - 0
src/docker/build/vps/shadowsocks/Dockerfile

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

+ 12 - 0
src/docker/conf/vps.conf

@@ -0,0 +1,12 @@
+[base]
+path = {base}
+network = vps
+
+[shadowsocks]
+port = 6443:6443,6500:6500/udp
+command = -m "ss-server" -s "-s 0.0.0.0 -p 6443 -m aes-256-cfb -k yb168 --fast-open" -x -e "kcpserver" -k "-t 0.0.0.0:6443 -l :6500 -mode fast2"
+;https://hub.docker.com/r/mritd/shadowsocks/
+
+/data/dm/src/shell/container/run -it --name=vps-shadowsocks --hostname=vps-shadowsocks --restart=always -d -v /data/dm/container/share:/share -v /etc/hosts:/etc/hosts.main -p 6443:6443 -p 6500:6500/udp --net=vps docker.dever.cc/vps/shadowsocks  -m "ss-server" -s "-s 0.0.0.0 -p 6443 -m aes-256-cfb -k yb168 --fast-open" -x -e "kcpserver" -k "-t 0.0.0.0:6443 -l :6500 -mode fast2"
+
+docker run -dt --name ssserver -p 6443:6443 -p 6500:6500/udp mritd/shadowsocks -m "ss-server" -s "-s 0.0.0.0 -p 6443 -m aes-256-cfb -k test123 --fast-open" -x -e "kcpserver" -k "-t 127.0.0.1:6443 -l :6500 -mode fast2"

+ 4 - 1
src/docker/core.conf

@@ -80,4 +80,7 @@ registry			= base/registry
 consul				= service/consul
 
 ;dever
-oauth2				= dever/oauth2
+oauth2				= dever/oauth2
+
+;vps
+shadowsocks			= vps/shadowsocks