🔧 upgrade dependencies in docker setup; drop outdated Dockerfile

Author: krmax44

Dockerfile

@@ -4,7 +4,6 @@
 
 [FragDenStaat.de](https://fragdenstaat.de) is the German instance of [Froide](https://github.com/okfde/froide) – a freedom of information portal software.
 
-
 ## Development environment
 
 FragDenStaat.de is a Django app with a PostgreSQL+PostGIS database and elasticsearch search service.
@@ -17,7 +16,8 @@ If you do not want to use Docker, you can install this like any Django project w
 FragDenStaat.de is a Django project that uses the core `froide` project and other `froide` Django apps as plugins. These froide and related apps are installed from repositories and it makes sense to set them up on your dev machine.
 
 You need to have installed:
-- Python 3.8+
+
+- Python 3.10+
 - yarn
 - GDAL for Django's GeoDjango
 - freetype and imagemagick
@@ -32,14 +32,14 @@ All of these dependencies should be installable via package managers (e.g. `brew
 
 To make the setup easier the following script (`devsetup.sh`) creates a virtual environment, sets up and installs all repos of the Python backend and installs and links all repos of the JavaScript frontend build.
 
-```
+```bash
 cd project-dir
 curl https://raw.githubusercontent.com/okfde/fragdenstaat_de/main/devsetup.sh | bash
 ```
 
 To update your setup later:
 
-```
+```bash
 cd project-dir
 bash fragdenstaat_de/devsetup.sh
 ```
@@ -50,19 +50,19 @@ You can run your own Postgres+PostGIS database and Elasticsearch service or run
 
 You need [Docker Desktop](https://docs.docker.com/desktop). Make sure Docker is running and use the following command:
 
-```
-docker compose -f docker-compose.dev.yml up
+```bash
+docker compose -f compose-dev.yaml up
 ```
 
-This will start Postgres and Elasticsearch and listen on port 5432 and 9200 respectively. You can adjust the port mapping in the `docker-compose.dev.yml`.
+This will start Postgres and Elasticsearch and listen on port 5432 and 9200 respectively. You can adjust the port mapping in the `compose-dev.yaml`.
 
 ### Setup database
 
 If you need to adjust settings, you can copy the `fragdenstaat_de/settings/local_settings.py.example` to `fragdenstaat_de/settings/local_settings.py` and edit it.
 
 To initialise the database:
 
-```
+```bash
 # Activate virtualenv
 source fds-env/bin/activate
 cd fragdenstaat_de
@@ -72,7 +72,7 @@ python manage.py migrate --skip-checks
 
 To get started with some data:
 
-```
+```bash
 # Load initial data (e.g. some CMS test fixtures)
 python manage.py loaddata tests/fixtures/cms.json
 # Create a superuser
@@ -86,40 +86,37 @@ python manage.py search_index --populate
 
 Example of loading SQL dumps into Docker postgres:
 
-```
-docker compose -f docker-compose.dev.yml exec db dropdb -U fragdenstaat_de fragdenstaat_de
-docker compose -f docker-compose.dev.yml exec db createdb -U fragdenstaat_de -O fragdenstaat_de fragdenstaat_de
-gunzip -k -c dump.sql.gz | docker compose -f docker-compose.dev.yml exec -T db psql -U fragdenstaat_de
+```bash
+docker compose -f compose-dev.yaml exec db dropdb -U fragdenstaat_de fragdenstaat_de
+docker compose -f compose-dev.yaml exec db createdb -U fragdenstaat_de -O fragdenstaat_de fragdenstaat_de
+gunzip -k -c dump.sql.gz | docker compose -f compose-dev.yaml exec -T db psql -U fragdenstaat_de
 ```
 
 ### Quick start after setup
 
-```
+```bash
 source fds-env/bin/activate
 cd fragdenstaat_de
 # Start service in background with -d
-docker compose -f docker-compose.dev.yml up -d
+docker compose -f compose-dev.yaml up -d
 python manage.py runserver
 ```
 
 ### Frontend development
 
-```
+```bash
 cd fragdenstaat_de
-yarn run serve
+yarn run dev
 ```
 
 ### Upgrade dependencies
 
-Currently `pip-compile` only works for `pip-tools==6.3.0` and `pip==21.2.4`.
-
-```
+```bash
 pip-compile -U requirements.in
 pip-compile -U requirements-dev.in
 pip-compile -U requirements-production.in
 ```
 
-
 ### Main app dependencies
 
 The `fragdenstaat_de` project depends on `froide`, multiple `froide`-related apps.
@@ -134,9 +131,6 @@ flowchart LR
 
 ```
 
-
 ## License
 
 Froide and fragdenstaat_de are licensed under the AGPL License.
-
-Some folders contain an attributions.txt with more information about the copyright holders for files in this specific folder.

README.md

@@ -0,0 +1,31 @@
+services:
+  db:
+    image: postgis/postgis:16-3.4
+    volumes:
+      - pg-data:/var/lib/postgresql/
+    ports:
+      - '127.0.0.1:5432:5432'
+    environment:
+      POSTGRES_USER: fragdenstaat_de
+      POSTGRES_DB: fragdenstaat_de
+      POSTGRES_PASSWORD: fragdenstaat_de
+
+  elasticsearch:
+    build: ./deps/elasticsearch/
+    volumes:
+      - es-data:/usr/share/elasticsearch/data
+      - es-logs:/var/log
+    environment:
+      - 'discovery.type=single-node'
+      - 'cluster.routing.allocation.disk.threshold_enabled=false'
+      - 'cluster.routing.allocation.disk.watermark.low=3gb'
+      - 'cluster.routing.allocation.disk.watermark.high=2gb'
+      - 'cluster.routing.allocation.disk.watermark.flood_stage=1gb'
+      - 'xpack.security.enabled=false'
+    ports:
+      - '127.0.0.1:9200:9200'
+
+volumes:
+  es-data:
+  es-logs:
+  pg-data:

compose-dev.yaml

@@ -1,4 +1,4 @@
-FROM docker.elastic.co/elasticsearch/elasticsearch:8.11.3
+FROM elasticsearch:8.14.3
 
 RUN mkdir -p /usr/share/elasticsearch/config/analysis && curl -o /usr/share/elasticsearch/config/analysis/de_DR.xml "https://raw.githubusercontent.com/uschindler/german-decompounder/master/de_DR.xml"
 RUN mkdir -p /usr/share/elasticsearch/config/analysis && curl -o /usr/share/elasticsearch/config/analysis/dictionary-de.txt "https://raw.githubusercontent.com/uschindler/german-decompounder/master/dictionary-de.txt"