zhouchijian
/
fe-drone-ci
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ci
continuous-integration/drone/push Build is passing Details

This commit is contained in:
周炽键 2021-06-02 21:51:15 +08:00
parent 60958c24fd
commit 38c12e7190
4 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.drone.yml
View File

@ -44,10 +44,7 @@ steps:
from_secret: ssh_pwd from_secret: ssh_pwd
port: 8011 port: 8011
target: target:
- /mnt/d/deploy/node/UserModule - /mnt/d/deploy/fe/cidemoadmin
- /mnt/d/deploy/node/UserModule
- /mnt/d/deploy/node/UserModule/conf
- /mnt/d/deploy/node/UserModule/conf
source: source:
- dist - dist
- docker-compose.yml - docker-compose.yml
@ -64,7 +61,7 @@ steps:
from_secret: ssh_pwd from_secret: ssh_pwd
port: 8011 port: 8011
script: script:
- cd /mnt/d/deploy/node/UserModule - cd /mnt/d/deploy/fe/cidemoadmin
- docker-compose down - docker-compose down
- docker-compose up -d - docker-compose up -d
- docker-compose logs - docker-compose logs

5
Dockerfile
View File

@ -1,5 +0,0 @@
FROM nginx
COPY dist /src
RUN yarn global add pm2

4
docker-compose.yml
View File

@ -6,7 +6,7 @@ services:
image: nginx:1.19.2 image: nginx:1.19.2
volumes: volumes:
- ./dist:/var/www - ./dist:/var/www
- ./conf/nginx.conf:/etc/nginx/conf - ./nginx.conf:/etc/nginx/conf
networks: networks:
- feadmindroneci - feadmindroneci
@ -15,7 +15,7 @@ services:
networks: networks:
- feadmindroneci - feadmindroneci
volumes: volumes:
- ./conf/frpc.ini:/etc/frp/frpc.ini - ./frpc.ini:/etc/frp/frpc.ini
depends_on: depends_on:
- nginx - nginx
restart: always restart: always

2
nginx.conf
View File

@ -78,7 +78,7 @@ http {
server_name demo-admin.ryio.cn; server_name demo-admin.ryio.cn;
location / { location / {
root /var/www/dist; root /var/www;
index index.html; index index.html;
try_files $uri $uri/ /index.html; try_files $uri $uri/ /index.html;
} }