From 278303f54103acf6c7c31b39d1e1894c0a104b4d Mon Sep 17 00:00:00 2001 From: James Pattinson Date: Mon, 1 Jun 2026 16:49:15 -0400 Subject: [PATCH] Docker update --- Dockerfile | 2 +- docker-compose.yml | 12 +++++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index df7f912..ca7d1c2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,4 +10,4 @@ RUN pip install --no-cache-dir -r requirements.txt COPY . . -EXPOSE 8000 +EXPOSE 80 diff --git a/docker-compose.yml b/docker-compose.yml index 550a54d..81899c6 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -16,7 +16,7 @@ services: web: build: . - command: ["gunicorn", "--bind", "0.0.0.0:8000", "app.web:app"] + command: ["gunicorn", "--bind", "0.0.0.0:80", "app.web:app"] environment: DATABASE_URL: ${DATABASE_URL:-mysql+pymysql://${MYSQL_USER:-switchbot}:${MYSQL_PASSWORD:-switchbot_password}@db:3306/${MYSQL_DATABASE:-switchbot}} SWITCHBOT_TOKEN: ${SWITCHBOT_TOKEN:-} @@ -24,11 +24,12 @@ services: COLLECT_INTERVAL_SECONDS: ${COLLECT_INTERVAL_SECONDS:-900} APP_TIMEZONE: ${APP_TIMEZONE:-Europe/London} FLASK_SECRET_KEY: ${FLASK_SECRET_KEY:-dev-only-secret} - ports: - - "8000:8000" depends_on: db: condition: service_healthy + networks: + - default + - webapps collector: build: . @@ -46,3 +47,8 @@ services: volumes: mysql_data: + +networks: + default: + webapps: + external: true \ No newline at end of file