Debakel · Oct 14, 2026 · Oct 14, 2026 · Oct 13, 2026 · Oct 13, 2026
diff --git a/.dockerignore b/.dockerignore
@@ -0,0 +1,16 @@
+.git
+.github
+.idea
+.claude
+.venv
+.pytest_cache
+**/__pycache__
+**/*.pyc
+.DS_Store
+local.env
+frontends
+staticfiles
+Dockerfile
+.dockerignore
+spatialite.Dockerfile
+*.dump
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -7,52 +7,11 @@ on:
     branches: [ main ]
 
 jobs:
-  build:
+  test:
 
     runs-on: ubuntu-latest
 
-    services:
-      db_service:
-        image: postgis/postgis
-        env:
-          POSTGRES_USER: postgres
-          POSTGRES_DB: postgres
-          POSTGRES_PASSWORD: postgres
-        # Set health checks to wait until postgres has started
-        options: >-
-          --health-cmd pg_isready
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
-        ports:
-          - 5432:5432
-
     steps:
       - uses: actions/checkout@v2
-      - name: Install system dependencies (geospatial libraries)
-        run: |
-          sudo apt-get update
-          sudo apt-get install binutils libproj-dev gdal-bin
-      - name: Set up Python
-        uses: actions/setup-python@v5
-        with:
-          python-version-file: .python-version
-      - name: Install uv
-        uses: astral-sh/setup-uv@v6
-        with:
-          enable-cache: true
-      - name: Install Python Dependencies
-        run: |
-          uv sync --locked --all-groups
-      - name: Migrate database
-        run: |
-          uv run python manage.py migrate
-        env:
-          SECRET_KEY: secret
-          DATABASE_URL: postgresql://postgres:postgres@localhost:5432/postgres
       - name: Run Tests
-        env:
-          SECRET_KEY: secret
-          DATABASE_URL: postgresql://postgres:postgres@localhost:5432/postgres
-        run: |
-          uv run pytest
+        run: make test
diff --git a/.gitignore b/.gitignore
@@ -4,3 +4,4 @@
 local.env
 .DS_Store
 dumpstermap-frontend-*
+db.sqlite3
diff --git a/Dockerfile b/Dockerfile
@@ -0,0 +1,40 @@
+# Multi-stage build.
+
+# Stages:
+#   - deps: Prepares the runtime environment
+#   - app: Adds application code
+
+# Stage `deps`
+FROM ghcr.io/astral-sh/uv:0.9.26-python3.12-trixie-slim AS deps
+
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends \
+    # GeoDjango dependencies:
+    gdal-bin libsqlite3-mod-spatialite \
+    # sqlite CLI enables consistent database backups (even with concurrent writers):
+    sqlite3 \
+    && rm -rf /var/lib/apt/lists/*
+
+WORKDIR /app
+
+ENV PYTHONDONTWRITEBYTECODE=1
+ENV UV_COMPILE_BYTECODE=1
+# Keep the virtualenv outside /app, so the code can be bind-mounted over /app (e.g. for tests)
+ENV UV_PROJECT_ENVIRONMENT=/opt/venv
+COPY pyproject.toml uv.lock ./
+RUN uv sync --locked --no-dev
+ENV PATH="/opt/venv/bin:$PATH"
+
+# Stage `app`
+FROM deps
+
+COPY . .
+
+ENV DATABASE_URL=spatialite:////data/db.sqlite3
+
+RUN SECRET_KEY=collectstatic python manage.py collectstatic --no-input
+
+VOLUME /data
+EXPOSE 8000
+
+CMD ["./start.sh"]
diff --git a/Makefile b/Makefile
@@ -0,0 +1,22 @@
+.PHONY: build build-deps test runserver
+
+IMAGE ?= dumpstermap-backend
+PORT ?= 8000
+
+build:
+	docker build -t $(IMAGE) .
+
+build-deps:
+	docker build --target deps -t $(IMAGE)-deps .
+
+test: build-deps
+	docker run --rm -v "$(CURDIR)":/app $(IMAGE)-deps pytest -p no:cacheprovider $(ARGS)
+
+DEV_ENV = -e DEBUG=True -e SECRET_KEY=insecure-dev-key
+DOCKER_CMD = docker run --rm $(DEV_ENV) -v "$(CURDIR)":/app
+
+migrate: build-deps
+	$(DOCKER_CMD) $(IMAGE)-deps python manage.py migrate
+
+runserver: build-deps migrate
+	$(DOCKER_CMD) -p $(PORT):8000 $(IMAGE)-deps python manage.py runserver 0.0.0.0:8000
diff --git a/Procfile b/Procfile
diff --git a/README.md b/README.md
@@ -4,8 +4,8 @@
 ## Built with
 ### Backend
 * Python, Django, Django REST framework (with [geospatial add-ons](https://github.com/openwisp/django-rest-framework-gis))
-* PostgreSQL, PostGIS, Docker
-* Deployed to Heroku
+* SQLite, SpatiaLite
+* Deployed to [Fly.io](https://fly.io)
 
 ### Frontend
 * TypeScript, Angular, Leaflet
@@ -20,18 +20,12 @@
 The development setup requires:
 * [uv](https://docs.astral.sh/uv/) (installs the required Python version automatically)
 * [Geospatial libraries required by GeoDjango](https://docs.djangoproject.com/en/4.1/ref/contrib/gis/install/geolibs/)
-* Docker to run a Postgres database with [GIS extension](https://postgis.net/).
+* [SpatiaLite](https://docs.djangoproject.com/en/5.2/ref/contrib/gis/install/spatialite/)
 
 To install the required python version and all python dependencies (including dev tools), run:
 
     uv sync --all-groups
 
-### Database
-
-In order to start a basic docker container capable of serving a PostGIS-enabled database (with `postgres` as default
-user and database), run:
-
-     docker run -p 5432:5432 --name some-postgis -e POSTGRES_PASSWORD=mysecretpassword -d imresamu/postgis
 
 ### Configuration
 
@@ -40,19 +34,18 @@ optional variables.
 
 ### Migrate database
 
-Run `uv run manage.py migrate` to create all database tables.
+Run `make migrate` to create all database tables.
 
 ### Development server
 
-Run `uv run manage.py runserver` for a dev server.
+Run `make test` for a dev server.
 
 ### Running tests
-Run `uv run pytest` to execute the unit tests.
-
+Run `make pytest` to execute the unit tests.
 
 ## Deployment
 
-[![Deploy](https://www.herokucdn.com/deploy/button.svg)](https://heroku.com/deploy)
+    fly deploy
 
- ## License
- tbd
+## License
+tbd
diff --git a/app.json b/app.json
diff --git a/dumpstermap/settings.py b/dumpstermap/settings.py
@@ -40,9 +40,10 @@
 ALLOWED_HOSTS = [
     "dumpstermap.org",
     "dumpstermap.vercel.app",
-    "dumpstermap.herokuapp.com",
+    "dumpstermap-backend.fly.dev",
     env.str("HOST_NAME", ""),
 ]
+CSRF_TRUSTED_ORIGINS = [f"https://{host}" for host in ALLOWED_HOSTS if host]
 
 # Application definition
 
@@ -71,7 +72,7 @@
     "django.middleware.common.CommonMiddleware",
 ]
 
-DATABASES = {"default": env.db(engine="django.contrib.gis.db.backends.postgis")}
+DATABASES = {"default": env.db(default=f"spatialite:///{BASE_DIR / 'db.sqlite3'}")}
 DEFAULT_AUTO_FIELD = "django.db.models.AutoField"
 
 ROOT_URLCONF = "dumpstermap.urls"

diff --git a/fly.toml b/fly.toml
@@ -0,0 +1,17 @@
+app = "dumpstermap-backend"
+primary_region = "fra"
+swap_size_mb = 512
+
+[http_service]
+internal_port = 8000
+force_https = true
+auto_stop_machines = "off"
+auto_start_machines = true
+
+[[mounts]]
+source = "dumpstermap_data"
+destination = "/data"
+
+[[vm]]
+size = "shared-cpu-1x"
+memory = "256mb"
diff --git a/local.env.sample b/local.env.sample
@@ -1,10 +1,9 @@
 # ℹ️ Required variables
 # ---------------------
-# DATABASE_URL schema:
-# postgresql://user:password@localhost:5432/db_name
 SECRET_KEY=<REQUIRED>
-DATABASE_URL=<REQUIRED>
 
 # ℹ️ Optional variables
 # ---------------------
-DEBUG=<REQUIRED>
+# For supported URL schemas, refer to https://django-environ.readthedocs.io/en/latest/types.html#environ-env-db-url
+# DATABASE_URL=spatialite:///db.sqlite3
+# DEBUG=False
diff --git a/pyproject.toml b/pyproject.toml
@@ -9,10 +9,8 @@ dependencies = [
     "django-cors-headers",
     "djangorestframework",
     "djangorestframework-gis",
-    "psycopg2-binary",
     "requests",
     "gunicorn",
-    "dj-database-url",
     "django-environ",
     "pytest",
     "factory-boy",
@@ -26,12 +24,12 @@ dependencies = [
     "bucketstore",
     "geojson",
     "freezegun",
+    "pytest-env>=1.8.0",
 ]
 
 [dependency-groups]
 dev = [
     "pre-commit",
-    "pytest-dotenv",
 ]
 
 [tool.uv]

diff --git a/pytest.ini b/pytest.ini
@@ -1,5 +1,5 @@
 [pytest]
 DJANGO_SETTINGS_MODULE = dumpstermap.settings
 python_files = tests.py test_*.py *_test.py
-env_files =
-    local.env
+env =
+    SECRET_KEY=test
diff --git a/start.sh b/start.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+set -e
+
+python manage.py migrate --no-input
+exec gunicorn dumpstermap.wsgi --bind 0.0.0.0:8000