update
continuous-integration/drone/push Build encountered an error Details

This commit is contained in:
周炽键 2021-06-06 12:52:08 +08:00
parent 06203be6bd
commit ce9a74411e
2 changed files with 9 additions and 6 deletions

View File

@ -38,7 +38,6 @@ steps:
- name: deploy - name: deploy
image: docker/compose image: docker/compose
privileged: true
environment: environment:
DOCKER_REG_USERNAME: DOCKER_REG_USERNAME:
from_secret: docker_reg_username from_secret: docker_reg_username
@ -47,15 +46,19 @@ steps:
volumes: volumes:
- name: dockersock - name: dockersock
path: /var/run/docker.sock path: /var/run/docker.sock
- name: frpc
path: ./frpc.ini
commands: commands:
- docker login -u $DOCKER_REG_USERNAME -p $DOCKER_REG_PASSWORD https://docker.zcj.plus - docker login -u $DOCKER_REG_USERNAME -p $DOCKER_REG_PASSWORD https://docker.zcj.plus
- docker-compose up -d - docker-compose up -d
- docker-compose logs # - docker cp frpc.ini fe_frpc:/etc/frp/frpc.ini
- docker cp frpc.ini fe_frpc:/etc/frp/frpc.ini # - docker restart fe_frpc
- docker restart fe_frpc
volumes: volumes:
- name: frpc
host:
path: /mnt/d/ci_volumes/frpc_ini/fe.ini
- name: dockersock - name: dockersock
host: host:
path: /var/run/docker.sock path: /var/run/docker.sock

View File

@ -12,8 +12,8 @@ services:
container_name: fe_frpc container_name: fe_frpc
networks: networks:
- feadmindroneci - feadmindroneci
# volumes: volumes:
# - ./frpc.ini:/etc/frp/frpc.ini - frpc:/etc/frp/frpc.ini
depends_on: depends_on:
- web - web
restart: always restart: always