rabin 8 năm trước cách đây
mục cha
commit
59e65319a6

+ 10 - 0
src/core.py

@@ -285,6 +285,16 @@ class File(object):
 			os.makedirs(path)
 		return path
 
+class Git(object):
+	@staticmethod
+	def update(git, path):
+		if File.exists(path) == False:
+			Core.popen('git clone ' + git + ' ' + path, True)
+			print 'init:' + path + ' finished!'
+		else:
+			Core.popen('cd ' + path + ' && git pull', bg=True)
+			print 'update:' + path + ' finished!'
+
 class Core(object):
 	path = ''
 	@classmethod

+ 7 - 15
src/dever.py

@@ -10,6 +10,8 @@ from core import *
 class Dever(object):
 	git = 'http://git.dever.cc:3000/'
 	path = Core.path + 'container/share/lib/php/'
+	framework = 'dever/framework.git'
+	package = 'dever-package/'
 	@classmethod
 	def init(self):
 		method = Core.getMethod(Dever_Action, Args.action)
@@ -18,26 +20,16 @@ class Dever(object):
 class Dever_Action(object):
 	@staticmethod
 	def init():
-		if Args.name:
-			print 'init appname'
-		else:
-			Core.popen('git clone '+Dever.git+'dever/framework.git ' + Dever.path + 'dever', True)
-			print 'init:yes'
+		Git.update(Dever.git + Dever.framework, Dever.path + 'dever')
 
 	@staticmethod
 	def install():
-		print 'install '+Args.name+':yes'
+		Git.update(Dever.git + Dever.package + Args.name, Dever.path + 'dever_package/' + Args.name)
 
 	@classmethod
 	def update(self):
-		print 'update '+Args.name+':yes'
+		Git.update(Dever.git + Dever.package + Args.name, Dever.path + 'dever_package/' + Args.name)
 
-
-class Package(object):
-	@staticmethod
-	def update():
-		Core.popen('composer.update', True)
 	@staticmethod
-	def install(name):
-		Core.popen('composer.install ' + name, True)
-		print 'finished'
+	def create():
+		Git.update(Dever.git + Dever.framework, Dever.path + 'dever')

+ 17 - 0
src/docker/build/web/openresty/Dockerfile

@@ -0,0 +1,17 @@
+FROM docker.shemic.com/os/alpine/v3.4:latest
+
+MAINTAINER Rabin "https://github.com/shemic"
+
+ENV OR_HOME=/usr/local/openresty
+ENV OR_VERSION=1.11.2.5
+ENV PATH=$PATH:$OR_HOME/bin
+
+RUN apk add --no-cache --update curl gcc make perl libpcre32 libressl-dev openssl musl-dev pcre-dev zlib-dev && \
+	curl -O https://openresty.org/download/openresty-{$OR_VERSION}.tar.gz && \
+	tar -zxvf openresty-{$OR_VERSION}.tar.gz && \
+	cd openresty-{$OR_VERSION} && \
+	./configure && \
+	make && make install && \
+	apk del curl gcc make perl libpcre32 libressl-dev openssl musl-dev pcre-dev
+
+COPY openresty.sh /entrypoint/openresty.sh

+ 18 - 0
src/docker/build/web/openresty/openresty.sh

@@ -0,0 +1,18 @@
+#!/usr/bin/env sh
+set -e
+
+start_nginx()
+{
+	#exec nginx
+	process_start nginx
+}
+
+stop_nginx()
+{
+    nginx -s stop
+}
+
+monit_nginx()
+{
+	process_monit nginx
+}

+ 1 - 1
src/main.py

@@ -30,7 +30,7 @@
 
 	dm use dever 使用dever框架工具包
 	dm install manage 安装后台
-	dm init myapp 初始化一个项目
+	dm create myapp 初始化一个项目
 	dm install passport 安装官方passport
 
 """