Merge branch 'main' into '79-persistent-mqtt-messages'

# Conflicts:
#   docker-compose.yml

.env.example

@@ -57,7 +57,7 @@ CV_DB_USER=postgres
 CV_DB_PASSWORD=postgres
 CV_URL=https://sms-cv.helmholtz.cloud/sms/cv/
 # can be either 'db' or 'api'
-CV_ACCESS_TYPE=api
+CV_ACCESS_TYPE=db
 
 S3MAP_POSTGRES_HOST=database
 S3MAP_POSTGRES_PORT=5432

README.md

@@ -34,9 +34,17 @@ issued by
 
 ##  2. Run all the services and have fun
 
-```bash
-docker-compose up -d
-```
+- To start the services:
+  - execute `./up.sh`
+- To stop the services:
+  - execute `./down.sh`
+- To start the services including the `docker-compose-dev.yml` (see chapter "Extend or override docker-compose" for more information)
+  - execute `./up-with-dev.sh` 
+- To stop the services including the `docker-compose-dev.yml`
+  - execute `./down-with-dev.sh`
+- To execute any docker compose command use either
+  -  `./dc.sh` <command>
+  -  `./dc-with-dev.sh` <command>
 
 It will take some seconds until everything is up.
 

cron/Dockerfile

@@ -22,6 +22,7 @@ RUN chmod gu+rw /var/run \
 
 USER ${UID}
 
+ENV PGSSLROOTCERT=/etc/ssl/certs/ca-certificates.crt
 ENV STDOUT=/proc/1/fd/1
 ENV STDERR=/proc/1/fd/2
 

dc-with-dev.sh

+#!/usr/bin/env bash
+DIR_SCRIPT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+
+docker compose -f "${DIR_SCRIPT}/docker-compose.yml" -f "${DIR_SCRIPT}/docker-compose-dev.yml" $@
\ No newline at end of file

dc.sh

+#!/usr/bin/env bash
+DIR_SCRIPT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+
+docker compose -f "${DIR_SCRIPT}/docker-compose.yml" $@
\ No newline at end of file

down-with-dev.sh

+#!/usr/bin/env bash
+DIR_SCRIPT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+
+"${DIR_SCRIPT}/dc-with-dev.sh"  down
\ No newline at end of file

down.sh

+#!/usr/bin/env bash
+DIR_SCRIPT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+
+"${DIR_SCRIPT}/dc.sh" down
\ No newline at end of file

up-with-dev.sh

+#!/usr/bin/env bash
+DIR_SCRIPT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+
+"${DIR_SCRIPT}/dc-with-dev.sh"  up -d
\ No newline at end of file

up.sh

+#!/usr/bin/env bash
+DIR_SCRIPT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+
+"${DIR_SCRIPT}/dc.sh" up -d
\ No newline at end of file