diff --git a/docker-compose.yml b/docker-compose.yml index 26a4b37..5458f4d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -5,7 +5,7 @@ services: postgres: image: postgres:13-alpine networks: - - frontend + - frontend_labeu env_file: - .env volumes: @@ -14,7 +14,7 @@ services: redis: networks: - - frontend + - frontend_labeu image: redis:6-alpine volumes: - ./docker-volume/redis:/data @@ -24,15 +24,15 @@ services: peertube: image: chocobozzz/peertube:production-buster networks: - - frontend + - frontend_labeu env_file: - .env - ports: - - "1935:1935" - - "127.0.0.1:3001:9000" + # ports: + # - "1935:1935" + # - "127.0.0.1:3001:9000" volumes: - - ./dist:/app/client/dist + # - ./dist:/app/client/dist - ./docker-volume/data:/data - ./docker-volume/config:/config depends_on: @@ -42,22 +42,24 @@ services: labels: - "traefik.enable=true" - - "traefik.docker.network=frontend" - - "traefik.http.routers.peertube-http.rule=Host(`peertube.3peaks.re`)" + - "traefik.docker.network=frontend_labeu" + + - "traefik.http.routers.peertube-http.rule=Host(`${PEERTUBE_WEBSERVER_HOSTNAME}`)" - "traefik.http.routers.peertube-http.entrypoints=entrypoints-http" - "traefik.http.routers.peertube-http.middlewares=redirect" - "traefik.http.middlewares.redirect.redirectscheme.scheme=https" - - "traefik.http.routers.peertube-https.rule=Host(`peertube.3peaks.re`)" + + - "traefik.http.routers.peertube-https.rule=Host(`${PEERTUBE_WEBSERVER_HOSTNAME}`)" - "traefik.http.routers.peertube-https.entrypoints=entrypoints-https" - "traefik.http.routers.peertube-https.tls.certresolver=myresolver" - - "traefik.http.services.peertube.loadbalancer.server.port=3001" + - "traefik.http.services.peertube.loadbalancer.server.port=9000" networks: - frontend: + frontend_labeu: external: true # default: # ipam: diff --git a/labeu/docker-compose.yml b/labeu/docker-compose.yml new file mode 100644 index 0000000..4678b7c --- /dev/null +++ b/labeu/docker-compose.yml @@ -0,0 +1,68 @@ +version: "3.8" + +services: + + postgres: + image: postgres:13-alpine + networks: + - frontend_labeu + env_file: + - .env + volumes: + - ./docker-volume/db:/var/lib/postgresql/data + restart: "always" + + redis: + networks: + - frontend_labeu + image: redis:6-alpine + volumes: + - ./docker-volume/redis:/data + restart: "always" + + + peertube: + image: chocobozzz/peertube:production-buster + networks: + - frontend_labeu + env_file: + - .env + + # ports: + # - "1935:1935" + # - "127.0.0.1:3001:9000" + volumes: + - ./assets:/app/client/dist2 + - ./docker-volume/data:/data + - ./docker-volume/config:/config + depends_on: + - postgres + - redis + restart: "always" + + labels: + - "traefik.enable=true" + - "traefik.docker.network=frontend_labeu" + + - "traefik.http.routers.peertube-http.rule=Host(`${PEERTUBE_WEBSERVER_HOSTNAME}`)" + - "traefik.http.routers.peertube-http.entrypoints=entrypoints-http" + - "traefik.http.routers.peertube-http.middlewares=redirect" + - "traefik.http.middlewares.redirect.redirectscheme.scheme=https" + + - "traefik.http.routers.peertube-https.rule=Host(`${PEERTUBE_WEBSERVER_HOSTNAME}`)" + - "traefik.http.routers.peertube-https.entrypoints=entrypoints-https" + - "traefik.http.routers.peertube-https.tls.certresolver=myresolver" + - "traefik.http.services.peertube.loadbalancer.server.port=9000" + + + + +networks: + frontend_labeu: + external: true + # default: + # ipam: + # driver: default + # config: + # - subnet: 172.36.0.0/16 +