From 7598d0b2b9add2735bebb7b6126a5cc2fff0955f Mon Sep 17 00:00:00 2001 From: yangzuhao Date: Sun, 12 Feb 2023 14:38:12 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=83=A8=E7=BD=B2=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- control.sh | 2 +- deploy.sh | 4 +--- docker-compose.yml | 7 +++---- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/control.sh b/control.sh index 6238d61..a491888 100644 --- a/control.sh +++ b/control.sh @@ -2,7 +2,7 @@ EXEC_USER=work su - ${EXEC_USER} -DEPLOY_PATH="/home/work/apps/wiki" +DEPLOY_PATH="/home/work/docker/wiki" cd ${DEPLOY_PATH} docker-compose up -d \ No newline at end of file diff --git a/deploy.sh b/deploy.sh index d269eba..6e9f588 100644 --- a/deploy.sh +++ b/deploy.sh @@ -3,8 +3,7 @@ EXEC_USER=work su - ${EXEC_USER} -DEPLOY_PATH="/home/work/apps/wiki" -LOG_PATH="${DEPLOY_PATH}/log" +DEPLOY_PATH="/home/work/docker/wiki" folder_exists() { if [ -d "$1" ]; then @@ -22,5 +21,4 @@ pack_docker() { } folder_exists ${DEPLOY_PATH} -folder_exists ${LOG_PATH} pack_docker ${DEPLOY_PATH} \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 1e30ce0..e68ab1b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,4 +1,4 @@ -version: 2 +version: "3" services: docker-ui: hostname: wiki.flyaha.top @@ -16,6 +16,5 @@ services: volumes: - /home/work/apps/wiki/data:/wiki/data/ networks: - default: - external: - name: flyaha + flyaha: + external: true