Merge pull request #37 from iineva/v2

fix depoly script and typo

README.md

@@ -60,14 +60,9 @@ services:
       # option, qiniu public url
       - QINIU_URL=
       # option, metadata storage path, use random secret path to keep your metadata safer in case of remote storage
-      - MATA_PATH=appList.json
+      - META_PATH=appList.json
     volumes:
       - "/docker/data/ipa-server:/app/upload"
-    command:
-      - -public-url "$PUBLIC_URL"
-      - -qiniu "$QINIU"
-      - -qiniu-url "$QINIU_URL"
-      - -mata-path "$MATA_PATH"
   caddy:
     image: abiosoft/caddy:0.11.5
     restart: always

README_zh.md

@@ -65,14 +65,9 @@ services:
       # option, 七牛DNS域名，注意要加 https://
       - QINIU_URL=
       # option, 元数据存储路径, 使用一个随机路径来保护元数据，因为在使用远程存储的时候，没有更好的方法防止外部直接访问元数据文件
-      - MATA_PATH=appList.json
+      - META_PATH=appList.json
     volumes:
       - "/docker/data/ipa-server:/app/upload"
-    command:
-      - -public-url "$PUBLIC_URL"
-      - -qiniu "$QINIU"
-      - -qiniu-url "$QINIU_URL"
-      - -mata-path "$MATA_PATH"
   caddy:
     image: abiosoft/caddy:0.11.5
     restart: always
@@ -107,3 +102,4 @@ make
 - [ ] 设计全新的鉴权方式，初步考虑试用GitHub登录鉴权
 - [x] 支持七牛存储
 - [x] 兼容v1产生数据，无缝升级
+- [ ] 支持命令行生成静态文件部署

app.json

@@ -20,7 +20,7 @@
             "required": false,
             "value": ""
         },
-        "MATA_PATH": {
+        "META_PATH": {
             "description": "option, metadata storage path, use random secret path to keep your metadata safer in case of remote storage",
             "required": false,
             "value": "appList.json"

cmd/ipasd/ipasd.go

@@ -42,8 +42,6 @@ func main() {
 	flag.Usage = usage
 	flag.Parse()
 
-	host := fmt.Sprintf("%s:%s", *addr, *port)
-
 	serve := http.NewServeMux()
 
 	logger := log.NewLogfmtLogger(os.Stderr)
@@ -109,6 +107,7 @@ func main() {
 		fmt.Sprintf("/%s", *metadataPath): fmt.Sprintf("/%s", uuid.NewString()),
 	}, http.FileServer(staticFS)))
 
+	host := fmt.Sprintf("%s:%s", *addr, *port)
 	logger.Log("msg", fmt.Sprintf("SERVER LISTEN ON: http://%v", host))
 	logger.Log("msg", http.ListenAndServe(host, serve))
 }

docker-compose.yml

@@ -13,14 +13,8 @@ services:
       # option, qiniu public url
       - QINIU_URL=
       # option, metadata storage path, use random secret path to keep your metadata safer in case of remote storage
-      - MATA_PATH=appList.json
+      - META_PATH=appList.json
     ports:
       - "9008:8080"
     volumes:
       - "/docker/data/ipa-server:/app/upload"
-    command:
-    - -public-url "$PUBLIC_URL"
-    - -qiniu "$QINIU"
-    - -qiniu-url "$QINIU_URL"
-    - -mata-path "$MATA_PATH"
-

docker-entrypoint.sh

@@ -1,7 +1,28 @@
 #!/bin/sh
 
-/app/ipasd \
-    -port "$PORT" \
-    -public-url "${PUBLIC_URL:-$DOMAIN}" \
-    -qiniu "$QINIU" \
-    -qiniu-url "$QINIU_URL"
+ipasd_args=""
+
+if [ -n "$PORT" ];then
+    ipasd_args=$ipasd_args"-port $PORT "
+fi
+
+PUBLIC_URL=${PUBLIC_URL:-$DOMAIN}
+if [ -n "$PUBLIC_URL" ];then
+    ipasd_args=$ipasd_args"-public-url $PUBLIC_URL"
+fi
+
+if [ -n "$QINIU" ];then
+    ipasd_args=$ipasd_args"-qiniu $QINIU"
+fi
+
+if [ -n "$QINIU_URL" ];then
+    ipasd_args=$ipasd_args"-qiniu-url $QINIU_URL"
+fi
+
+if [ -n "$META_PATH" ];then
+    ipasd_args=$ipasd_args"-meta-path $META_PATH"
+fi
+
+echo $ipasd_args
+
+./ipasd $ipasd_args