Compare commits

...

3 Commits

Author SHA1 Message Date
usa.yimian.xyz a3b18befa4 vless 3 years ago
cn.yimian.xyz 1fe8843c7d ssl_rm_cn 3 years ago
usa.yimian.xyz 3e40819e7a ssl_usa 3 years ago
  1. 14
      cn.yimian.xyz/docker-compose.yml
  2. 7
      usa.yimian.xyz/docker-compose.yml

@ -19,7 +19,6 @@ services:
- "/home/www/:/home/www/"
#network_mode: "host"
depends_on:
- oneindex
- php-fpm
- session
- acg.watch-api
@ -97,19 +96,6 @@ services:
network_mode: "host"
ssl:
#build: https://github.com/iotcat/ushio-ssl.git
#image: iotcat/ushio-ssl
image: docker.yimian.xyz:4450/ssl
container_name: ssl
restart: always
#deploy:
# restart_policy:
# delay: 86400s
volumes:
- "/mnt/config/acme.sh/:/root/.acme.sh/"
- "/mnt/var/ssl/:/mnt/config/ssl/"
# common apps
# -------------------------------------

@ -127,10 +127,12 @@ services:
#image: docker.yimian.xyz:4450/ssl
container_name: ssl
restart: always
command: ["/bin/bash", "-c", "/acme.sh --install && tail -f /dev/null"]
#deploy:
# restart_policy:
# delay: 86400s
volumes:
- "/var/log/acme.log:/var/log/acme.log"
- "/mnt/config/acme.sh/:/root/.acme.sh/"
- "/mnt/var/ssl/:/mnt/config/ssl/"
@ -158,7 +160,7 @@ services:
v2ray:
image: v2ray/official
image: v2fly/v2fly-core
#image: docker.yimian.xyz/v2ray
container_name: v2ray
restart: always
@ -167,7 +169,8 @@ services:
- "/var/log/v2ray/usa/:/var/log/v2ray/"
v-china:
image: v2ray/official
#image: v2ray/official
image: v2fly/v2fly-core
#image: iotcat/v-china2
#image: docker.yimian.xyz/v-china2
container_name: v-china

Loading…
Cancel
Save