diff --git a/.drone.yml b/.drone.yml index 1a0b7e3e..33194e67 100644 --- a/.drone.yml +++ b/.drone.yml @@ -44,10 +44,7 @@ steps: from_secret: ssh_pwd port: 8011 target: - - /mnt/d/deploy/node/UserModule - - /mnt/d/deploy/node/UserModule - - /mnt/d/deploy/node/UserModule/conf - - /mnt/d/deploy/node/UserModule/conf + - /mnt/d/deploy/fe/cidemoadmin source: - dist - docker-compose.yml @@ -64,7 +61,7 @@ steps: from_secret: ssh_pwd port: 8011 script: - - cd /mnt/d/deploy/node/UserModule + - cd /mnt/d/deploy/fe/cidemoadmin - docker-compose down - docker-compose up -d - docker-compose logs diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index 44892cc6..00000000 --- a/Dockerfile +++ /dev/null @@ -1,5 +0,0 @@ -FROM nginx - -COPY dist /src - -RUN yarn global add pm2 \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index f8a838a7..9e3818bc 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -6,7 +6,7 @@ services: image: nginx:1.19.2 volumes: - ./dist:/var/www - - ./conf/nginx.conf:/etc/nginx/conf + - ./nginx.conf:/etc/nginx/conf networks: - feadmindroneci @@ -15,7 +15,7 @@ services: networks: - feadmindroneci volumes: - - ./conf/frpc.ini:/etc/frp/frpc.ini + - ./frpc.ini:/etc/frp/frpc.ini depends_on: - nginx restart: always diff --git a/nginx.conf b/nginx.conf index 00e135a8..4f646d3f 100644 --- a/nginx.conf +++ b/nginx.conf @@ -78,7 +78,7 @@ http { server_name demo-admin.ryio.cn; location / { - root /var/www/dist; + root /var/www; index index.html; try_files $uri $uri/ /index.html; }