use run.sh script

zixia · Dec 28, 2020 · 4b5eba2 · 4b5eba2
1 parent 4a723c6
commit 4b5eba2
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 12 deletions.
diff --git a/Makefile b/Makefile
@@ -11,17 +11,7 @@ build:
 
 .PHONY: run
 run:
- docker run \
- --name 17salsa.com \
- --rm \
- -ti \
- -e SALSA17_MYSQL_HOST \
- -e SALSA17_MYSQL_USER \
- -e SALSA17_MYSQL_PASS \
- -p 8080:80 \
- -v /tmp:/var/www/admin/UploadFiles/ \
- --entrypoint bash \
- 17salsa.com
+ ./scripts/run.sh
 
 .PHONY: pull
 pull:

diff --git a/README.md b/README.md
@@ -4,6 +4,10 @@
 
 17SALSA is a salsa social network for salsa, bachata, merengue dancers
 
+## Resources
+
+- [简单两步解决UCenter忘记创始人UCenter Administrator密码](https://blog.csdn.net/wwppp987/article/details/96651185)
+
 ## Maintainer
 
 [Huan](https://github.com/huan) [(阿布)](http:https://17salsa.com/home/abu), Chairman of [17SALSA](h

diff --git a/scripts/run.sh b/scripts/run.sh
@@ -13,7 +13,9 @@ docker run \
  -v /data/17salsa.com/home/attachment:/www/home/attachment \
  -v /data/17salsa.com/center/data:/www/center/data \
  -p 8080:80 \
- -e VIRTUAL_HOST=17salsa.com,www.17salsa.com,cdn.17salsa.com,17salsa.net,www.17salsa.net,17salsa.org,www.17salsa.org \
+ -e VIRTUAL_HOST=17salsa.com,*.17salsa.com,17salsa.net,*.17salsa.net,17salsa.org,*.17salsa.org \
+ -e LETSENCRYPT_HOST=17salsa.com,www.17salsa.com,cdn.17salsa.com,abu.17salsa.com,17salsa.net,www.17salsa.net,17salsa.org,www.17salsa.org \
+ -e HTTPS_METHOD=noredirect \
  --entrypoint bash \
  17salsa.com