diff --git a/Makefile b/Makefile index f3bf2ab..2ff2fbe 100644 --- a/Makefile +++ b/Makefile @@ -19,3 +19,6 @@ test: run: docker compose -f docker-compose.base.yml -f docker-compose.prod.yml build docker compose -f docker-compose.base.yml -f docker-compose.prod.yml up --remove-orphans + +stop: + docker compose -f docker-compose.base.yml -f docker-compose.prod.yml down diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml index c1cc4f4..bf80161 100644 --- a/docker-compose.prod.yml +++ b/docker-compose.prod.yml @@ -4,23 +4,24 @@ services: traefik: container_name: whisperbox-transcribe_traefik ports: - - "443:443" + - "80:80" + command: - "--providers.docker=true" - "--providers.docker.exposedbydefault=false" - "--providers.docker.network=whisperbox-transcribe_traefik" - - "--entrypoints.websecure.address=:443" - - "--certificatesresolvers.le.acme.email=${TRAEFIK_SSLEMAIL}" - - "--certificatesresolvers.le.acme.storage=./acme.json" - - "--certificatesresolvers.le.acme.tlschallenge=true" + - "--entrypoints.web.address=:80" + # - "--certificatesresolvers.le.acme.email=${TRAEFIK_SSLEMAIL}" + # - "--certificatesresolvers.le.acme.storage=./acme.json" + # - "--certificatesresolvers.le.acme.tlschallenge=true" labels: - - "traefik.http.routers.traefik.tls=true" - - "traefik.http.routers.traefik.tls.certresolver=le" - - "traefik.http.routers.traefik.entrypoints=websecure" - - "traefik.http.routers.http-catchall.rule=hostregexp(`{host:.+}`)" - - "traefik.http.routers.http-catchall.entrypoints=web" - - "traefik.http.routers.http-catchall.middlewares=redirect-to-https" - - "traefik.http.middlewares.redirect-to-https.redirectscheme.scheme=https" + # - "traefik.http.routers.traefik.tls=true" + # - "traefik.http.routers.traefik.tls.certresolver=le" + - "traefik.http.routers.traefik.entrypoints=web" + # - "traefik.http.routers.http-catchall.rule=hostregexp(`{host:.+}`)" + # - "traefik.http.routers.http-catchall.entrypoints=web" + # - "traefik.http.routers.http-catchall.middlewares=redirect-to-https" + # - "traefik.http.middlewares.redirect-to-https.redirectscheme.scheme=https" redis: @@ -52,9 +53,9 @@ services: - "traefik.enable=true" - "traefik.http.services.web.loadbalancer.server.port=8000" - "traefik.http.routers.web.rule=(Host(`${TRAEFIK_DOMAIN}`))" - - "traefik.http.routers.web.entrypoints=websecure" - - "traefik.http.routers.web.tls=true" - - "traefik.http.routers.web.tls.certresolver=le" + - "traefik.http.routers.web.entrypoints=web" + # - "traefik.http.routers.web.tls=true" + # - "traefik.http.routers.web.tls.certresolver=le" volumes: whisperbox-transcribe-data: diff --git a/web.Dockerfile b/web.Dockerfile index 4111ab4..c106984 100644 --- a/web.Dockerfile +++ b/web.Dockerfile @@ -20,4 +20,4 @@ COPY alembic.ini . ENV VIRTUAL_ENV /opt/venv ENV PATH /opt/venv/bin:$PATH -CMD alembic upgrade head && gunicorn -k uvicorn.workers.UvicornWorker app.web.main:app --bind ${HOST:-0.0.0.0}:${PORT:-8000} --log-level info --proxy-headers +CMD alembic upgrade head && uvicorn app.web.main:app --host ${HOST:-0.0.0.0} --port ${PORT:-8000} --log-level info --workers 4 --proxy-head>