From 4db0bf66b50297a5436af631e91e2b5cc5e16f35 Mon Sep 17 00:00:00 2001 From: liuyx Date: Tue, 27 Feb 2024 10:15:54 +0000 Subject: [PATCH] update host mode --- sub.Dockerfile => Dockerfile.sub | 0 docker-compose-def.yaml | 81 ++++++++++++++++++++++++++++++++ docker-compose.yaml | 71 ++-------------------------- 3 files changed, 85 insertions(+), 67 deletions(-) rename sub.Dockerfile => Dockerfile.sub (100%) create mode 100644 docker-compose-def.yaml diff --git a/sub.Dockerfile b/Dockerfile.sub similarity index 100% rename from sub.Dockerfile rename to Dockerfile.sub diff --git a/docker-compose-def.yaml b/docker-compose-def.yaml new file mode 100644 index 0000000..7d32262 --- /dev/null +++ b/docker-compose-def.yaml @@ -0,0 +1,81 @@ +version: '4' +services: + v2: + container_name: v2 + image: mzz2017/v2raya:latest + restart: always + ports: + - 7990-7999:7990-7999 + init: true + networks: + - vlss + dns: + - 8.8.8.8 + - "2001:4860:4860::8888" + volumes: + - ${DIR}/v2a:/etc/v2raya + - /etc/localtime:/etc/localtime:ro + environment: + V2RAYA_LOG_LEVEL: debug + V2RAYA_ADDRESS: 0.0.0.0:7997 + TZ: + TERM: + # dae: + # container_name: dae + # image: daeuniverse/dae:latest + # restart: always + # privileged: true + # pid: host + # network_mode: host + # networks: + # - vlss + + ngx: + container_name: ngx + image: nginx:latest + restart: always + ports: + - 80:80 + - 443:443 + networks: + - vlss + environment: + TZ: + TERM: + volumes: + - ${DIR}/ngx/etc:/etc/nginx + - ${DIR}/ngx/log:/var/log/nginx + + subconv: + container_name: subv + restart: always + image: subconverter:dev + build: + context: . + dockerfile: sub.Dockerfile + networks: + - vlss + + subweb: + container_name: subw + restart: always + image: careywong/subweb:latest + networks: + - vlss + depends_on: + - subconv + +networks: + vlss: + driver: bridge + # external: true + name: local + # ip6net: + enable_ipv6: true + ipam: + driver: default + config: + - subnet: 192.18.0.0/16 + - subnet: fd00::/80 + gateway: fd00::1 + diff --git a/docker-compose.yaml b/docker-compose.yaml index 7d32262..b3cc972 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -1,17 +1,12 @@ version: '4' +# host services: v2: container_name: v2 - image: mzz2017/v2raya:latest + image: evlic/v2raya:latest restart: always - ports: - - 7990-7999:7990-7999 init: true - networks: - - vlss - dns: - - 8.8.8.8 - - "2001:4860:4860::8888" + network_mode: host volumes: - ${DIR}/v2a:/etc/v2raya - /etc/localtime:/etc/localtime:ro @@ -20,62 +15,4 @@ services: V2RAYA_ADDRESS: 0.0.0.0:7997 TZ: TERM: - # dae: - # container_name: dae - # image: daeuniverse/dae:latest - # restart: always - # privileged: true - # pid: host - # network_mode: host - # networks: - # - vlss - - ngx: - container_name: ngx - image: nginx:latest - restart: always - ports: - - 80:80 - - 443:443 - networks: - - vlss - environment: - TZ: - TERM: - volumes: - - ${DIR}/ngx/etc:/etc/nginx - - ${DIR}/ngx/log:/var/log/nginx - - subconv: - container_name: subv - restart: always - image: subconverter:dev - build: - context: . - dockerfile: sub.Dockerfile - networks: - - vlss - - subweb: - container_name: subw - restart: always - image: careywong/subweb:latest - networks: - - vlss - depends_on: - - subconv - -networks: - vlss: - driver: bridge - # external: true - name: local - # ip6net: - enable_ipv6: true - ipam: - driver: default - config: - - subnet: 192.18.0.0/16 - - subnet: fd00::/80 - gateway: fd00::1 - + \ No newline at end of file