diff --git a/docker-compose.build.yml b/docker-compose.build.yml index 4ff0419e..b1b1766f 100644 --- a/docker-compose.build.yml +++ b/docker-compose.build.yml @@ -33,6 +33,12 @@ services: condition: service_completed_successfully volumes: - kyoo:/metadata + labels: + - "traefik.enable=true" + - "traefik.http.routers.api.rule=PathPrefix(`/api/`)" + - "traefik.http.routers.api.middlewares=api-sp" + - "traefik.http.middlewares.api-sp.stripprefix.prefixes=/api" + - "traefik.http.middlewares.api-sp.stripprefix.forceSlash=false" migrations: build: @@ -50,6 +56,9 @@ services: restart: on-failure environment: - KYOO_URL=${KYOO_URL:-http://back:5000} + labels: + - "traefik.enable=true" + - "traefik.http.routers.front.rule=PathPrefix(`/`)" scanner: build: ./scanner @@ -121,20 +130,17 @@ services: - GOCODER_VAAPI_RENDERER=${GOCODER_VAAPI_RENDERER:-/dev/dri/renderD128} profiles: ['qsv'] - ingress: - image: nginx - restart: on-failure - environment: - - PORT=8901 - - FRONT_URL=http://front:8901 - - BACK_URL=${KYOO_URL:-http://back:5000} - volumes: - - ./nginx.conf.template:/etc/nginx/templates/kyoo.conf.template:ro - depends_on: - - back - - front + traefik: + image: traefik:v2.11 + command: + - "--providers.docker=true" + - "--providers.docker.exposedbydefault=false" + - "--entryPoints.web.address=:8901" + - "--log.level=DEBUG" ports: - "8901:8901" + volumes: + - "/var/run/docker.sock:/var/run/docker.sock:ro" postgres: image: postgres:15 diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index 6f2fa693..40299c2d 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -45,6 +45,12 @@ services: - ./back:/app - /app/out/ - kyoo:/metadata + labels: + - "traefik.enable=true" + - "traefik.http.routers.api.rule=PathPrefix(`/api/`)" + - "traefik.http.routers.api.middlewares=api-sp" + - "traefik.http.middlewares.api-sp.stripprefix.prefixes=/api" + - "traefik.http.middlewares.api-sp.stripprefix.forceSlash=false" migrations: build: @@ -74,6 +80,9 @@ services: restart: on-failure environment: - KYOO_URL=${KYOO_URL:-http://back:5000} + labels: + - "traefik.enable=true" + - "traefik.http.routers.front.rule=PathPrefix(`/`)" scanner: build: ./scanner @@ -145,17 +154,17 @@ services: - GOCODER_VAAPI_RENDERER=${GOCODER_VAAPI_RENDERER:-/dev/dri/renderD128} profiles: ['qsv'] - ingress: - image: nginx - restart: on-failure - environment: - - PORT=8901 - - FRONT_URL=http://front:3000 - - BACK_URL=${KYOO_URL:-http://back:5000} - volumes: - - ./nginx.conf.template:/etc/nginx/templates/kyoo.conf.template:ro + traefik: + image: traefik:v2.11 + command: + - "--providers.docker=true" + - "--providers.docker.exposedbydefault=false" + - "--entryPoints.web.address=:8901" + - "--log.level=DEBUG" ports: - "8901:8901" + volumes: + - "/var/run/docker.sock:/var/run/docker.sock:ro" postgres: image: postgres:15 diff --git a/docker-compose.yml b/docker-compose.yml index 32e51611..75ededcc 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -34,6 +34,12 @@ services: condition: service_completed_successfully volumes: - kyoo:/metadata + labels: + - "traefik.enable=true" + - "traefik.http.routers.api.rule=PathPrefix(`/api/`)" + - "traefik.http.routers.api.middlewares=api-sp" + - "traefik.http.middlewares.api-sp.stripprefix.prefixes=/api" + - "traefik.http.middlewares.api-sp.stripprefix.forceSlash=false" migrations: image: ghcr.io/zoriya/kyoo_migrations:edge @@ -49,6 +55,9 @@ services: restart: unless-stopped environment: - KYOO_URL=${KYOO_URL:-http://back:5000} + labels: + - "traefik.enable=true" + - "traefik.http.routers.front.rule=PathPrefix(`/`)" scanner: image: ghcr.io/zoriya/kyoo_scanner:edge @@ -120,20 +129,17 @@ services: - GOCODER_VAAPI_RENDERER=${GOCODER_VAAPI_RENDERER:-/dev/dri/renderD128} profiles: ['qsv'] - ingress: - image: nginx - restart: unless-stopped - environment: - - PORT=8901 - - FRONT_URL=http://front:8901 - - BACK_URL=${KYOO_URL:-http://back:5000} - volumes: - - ./nginx.conf.template:/etc/nginx/templates/kyoo.conf.template:ro - depends_on: - - back - - front + traefik: + image: traefik:v2.11 + command: + - "--providers.docker=true" + - "--providers.docker.exposedbydefault=false" + - "--entryPoints.web.address=:8901" + - "--log.level=DEBUG" ports: - "8901:8901" + volumes: + - "/var/run/docker.sock:/var/run/docker.sock:ro" postgres: image: postgres:15