diff --git a/docker-compose-test.yaml b/docker-compose-test.yaml new file mode 100644 index 0000000..fd2e2d1 --- /dev/null +++ b/docker-compose-test.yaml @@ -0,0 +1,15 @@ +version: '2.12' +services: + ngx: + # profiles: ["dev"] + container_name: ngx-t + image: nginx:latest + restart: always + # ports: + # - 80:80 + # - 443:443 + network_mode: host + volumes: + - /etc/localtime:/etc/localtime:ro + # - ${DIR}/ngx/etc:/etc/nginx + # - ${DIR}/ngx/log:/var/log/nginx \ No newline at end of file diff --git a/docker-compose.yaml b/docker-compose.yaml index ac0a509..b837ee9 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -29,6 +29,7 @@ services: # - vlss ngx: + profiles: ["dev"] container_name: ngx image: nginx:latest restart: always @@ -43,21 +44,28 @@ services: volumes: - ${DIR}/ngx/etc:/etc/nginx - ${DIR}/ngx/log:/var/log/nginx - + subconv: container_name: subv restart: always - image: tindy2013/subconverter:latest - ports: - - 25500:25500 - environment: - TZ: - TERM: + image: subconverter:dev + build: + context: . + dockerfile: sub.Dockerfile + networks: + - vlss + + subweb: + container_name: subw + restart: always + image: careywong/subweb:latest networks: - vlss depends_on: - - ngx + - subconv networks: vlss: - driver: bridge \ No newline at end of file + driver: bridge + external: true + name: local diff --git a/sub.Dockerfile b/sub.Dockerfile new file mode 100644 index 0000000..da7657d --- /dev/null +++ b/sub.Dockerfile @@ -0,0 +1,3 @@ +FROM tindy2013/subconverter:latest + +COPY ./sub/subconverter /usr/bin/subconverter \ No newline at end of file