fix onekey install.sh

close #50
This commit is contained in:
BennyThink
2021-08-13 12:44:48 +08:00
parent 5b03b0586a
commit 1a33526114
2 changed files with 17 additions and 16 deletions

View File

@@ -22,16 +22,6 @@ services:
- /var/run/docker.sock:/var/run/docker.sock - /var/run/docker.sock:/var/run/docker.sock
entrypoint: [ "socat", "tcp-listen:2375,fork,reuseaddr","unix-connect:/var/run/docker.sock" ] entrypoint: [ "socat", "tcp-listen:2375,fork,reuseaddr","unix-connect:/var/run/docker.sock" ]
yyets-web:
image: bennythink/yyetsbot
restart: unless-stopped
environment:
- mongo=mongo
working_dir: /YYeTsBot/yyetsweb/
volumes:
- ./data:/YYeTsBot/yyetsweb/data/
command: [ "python3","server.py","-h=0.0.0.0" ]
yyets-bot: yyets-bot:
image: bennythink/yyetsbot image: bennythink/yyetsbot
depends_on: depends_on:
@@ -51,7 +41,19 @@ services:
- ./certs/:/etc/nginx/certs/ - ./certs/:/etc/nginx/certs/
- ./logs:/var/log/nginx/ - ./logs:/var/log/nginx/
ports: ports:
- 80:80 - "80:80"
- 443:443 - "443:443"
environment: environment:
TZ: Asia/Shanghai TZ: Asia/Shanghai
yyets-web:
image: bennythink/yyetsbot
restart: unless-stopped
environment:
- mongo=mongo
working_dir: /YYeTsBot/yyetsweb/
volumes:
- ./data:/YYeTsBot/yyetsweb/data/
command: [ "python3","server.py","-h=0.0.0.0" ]
ports:
- "127.0.0.1:8888:8888"

View File

@@ -23,8 +23,7 @@ function prepare() {
function prepare_compose() { function prepare_compose() {
echo "[2/5] 下载docker-compose.yaml" echo "[2/5] 下载docker-compose.yaml"
curl -o docker-compose.yaml https://raw.githubusercontent.com/tgbot-collection/YYeTsBot/master/docker-compose.yml curl -o docker-compose.yaml https://raw.githubusercontent.com/tgbot-collection/YYeTsBot/master/docker-compose.yml
sed -i '37,59d' docker-compose.yaml sed -i '18,47d' docker-compose.yaml
sed -i '18,23d' docker-compose.yaml
sed -i 's/127.0.0.1/0.0.0.0/' docker-compose.yaml sed -i 's/127.0.0.1/0.0.0.0/' docker-compose.yaml
} }
@@ -53,7 +52,7 @@ function import_db() {
function up() { function up() {
echo "[5/5] 启动中……" echo "[5/5] 启动中……"
docker-compose up -d docker-compose up -d
echo "部署成功。您可以访问 http://127.0.0.1:8888 查看" echo "部署成功。您可以访问 http://IP:8888 查看"
} }
function deploy() { function deploy() {