From 9f25457b244c0166a21895eabdb94185268f13ec Mon Sep 17 00:00:00 2001 From: Finn Stutzenstein Date: Wed, 21 Oct 2026 08:21:12 +0000 Subject: [PATCH] Remove old docker-compose based dev setup The devcontainer replaces Dockerfile.dev, dc.dev.yml and the related start/entrypoint scripts. Co-Authored-By: Claude Opus 5.5 --- .devcontainer/Dockerfile | 2 +- Dockerfile.dev | 21 --------------------- dc-dev.sh | 2 -- dc.dev.yml | 27 --------------------------- scripts/entrypoint-dev.sh | 11 ----------- scripts/start-as-prod.sh | 3 --- scripts/start.sh | 2 -- 7 files changed, 1 insertion(+), 67 deletions(-) delete mode 100644 Dockerfile.dev delete mode 100755 dc-dev.sh delete mode 100644 dc.dev.yml delete mode 100755 scripts/entrypoint-dev.sh delete mode 100755 scripts/start-as-prod.sh delete mode 100755 scripts/start.sh diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index edec4f1..571ee5f 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,4 +1,4 @@ -# Keep the Python version in sync with Dockerfile.dev +# Keep the Python version in sync with the production Dockerfile FROM python:3.15-slim-trixie ARG USERNAME=dev diff --git a/Dockerfile.dev b/Dockerfile.dev deleted file mode 100644 index e0e1e63..0000000 --- a/Dockerfile.dev +++ /dev/null @@ -1,21 +0,0 @@ -FROM python:3.15-slim-trixie - -RUN apt -y update && apt -y upgrade && \ - apt install --no-install-recommends -y wait-for-it lsb-release wget gnupg2 gcc libpq-dev libc-dev vim postgresql-client && apt clean all - -WORKDIR /app - -COPY requirements.txt . -COPY requirements-dev.txt . -RUN pip install -U -r requirements.txt -r requirements-dev.txt - -RUN mkdir log - -ENV PYTHONPATH=/app/ -ENV FLASK_APP=max.app -ENV FLASK_ENV=development - -COPY scripts/* ./ - -ENTRYPOINT ["./entrypoint-dev.sh"] -CMD ["flask", "run", "--host", "0.0.0.0", "--port", "8000"] diff --git a/dc-dev.sh b/dc-dev.sh deleted file mode 100755 index 2a88d94..0000000 --- a/dc-dev.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -docker-compose -f dc.dev.yml $@ diff --git a/dc.dev.yml b/dc.dev.yml deleted file mode 100644 index 50d7637..0000000 --- a/dc.dev.yml +++ /dev/null @@ -1,27 +0,0 @@ -services: - max: - image: max:dev - volumes: - - ./max:/app/max - depends_on: - - postgresql - command: $MAX_COMMAND - ports: - - 8000:8000/tcp - environment: - - PGSQL_HOST=postgresql - - PGSQL_USER=max - - PGSQL_PASSWORD=max - - PGSQL_NAME=max - networks: - - postgresql - postgresql: - image: postgres:18.6 - environment: - - POSTGRES_USER=max - - POSTGRES_PASSWORD=max - - POSTGRES_DB=max - networks: - - postgresql -networks: - postgresql: diff --git a/scripts/entrypoint-dev.sh b/scripts/entrypoint-dev.sh deleted file mode 100755 index 472c72c..0000000 --- a/scripts/entrypoint-dev.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash - -set -e - -source "$(dirname "$0")/db-setup.sh" - -flask add-domain finn.st -flask add-domain stutzenste.in -flask reset-admin admin@finn.st admin - -exec "$@" diff --git a/scripts/start-as-prod.sh b/scripts/start-as-prod.sh deleted file mode 100755 index d13fd41..0000000 --- a/scripts/start-as-prod.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -export FLASK_ENV=production -gunicorn -w 1 -b 0.0.0.0:8000 max.app:app diff --git a/scripts/start.sh b/scripts/start.sh deleted file mode 100755 index 29766dd..0000000 --- a/scripts/start.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -flask run --host 0.0.0.0 --port 8000