Disable routinator services on development environment, rename profil…

…e only used for connectiontest
internetstandards · Oct 14, 2024 · 0f1af77 · 0f1af77
1 parent fdaa0eb
commit 0f1af77
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 6 deletions.
diff --git a/docker/build.env b/docker/build.env
@@ -2,7 +2,7 @@
 
 # include all compose files
 COMPOSE_FILE=docker/docker-compose.yml:docker/docker-compose-development.yml:docker/docker-compose-integration-tests.yml:docker/docker-compose-test.yml:docker/docker-compose-tools.yml:docker/docker-compose-test-runner-develop.yml:docker/docker-compose-integration-tests.yml
-COMPOSE_PROFILES=default,cron,batch,build
+COMPOSE_PROFILES=connectiontest,cron,routinator,batch,build
 
 # don't expose HTTP(S) and DNS ports to the outside, this also causes issues due to being privileged ports
 WEBSERVER_PORT=80

diff --git a/docker/defaults.env b/docker/defaults.env
@@ -125,7 +125,7 @@ COMPOSE_PROJECT_NAME=internetnl
 COMPOSE_FILE=docker/docker-compose.yml
 
 # enable all services and crons
-COMPOSE_PROFILES=default,cron
+COMPOSE_PROFILES=connectiontest,cron,routinator
 
 # interval for batch processing
 BATCH_SCHEDULER_INTERVAL=1

diff --git a/docker/develop.env b/docker/develop.env
@@ -71,4 +71,4 @@ INTERNETNL_BRANDING=False
 NGINX_PROXY_CACHE=off
 
 # only enable application services
-COMPOSE_PROFILES=default
+COMPOSE_PROFILES=connectiontest
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
@@ -540,6 +540,9 @@ services:
       start_period: 30m
       retries: 10
 
+    profiles:
+      - routinator
+
   # unbound DNS server used for connection test
   unbound:
     image: ${DOCKER_IMAGE_UNBOUND:-${DOCKER_REGISTRY:-ghcr.io/internetstandards}/unbound:${RELEASE:-latest}}
@@ -587,7 +590,7 @@ services:
       start_period: 1m
       retries: 10
     profiles:
-      - default
+      - connectiontest
 
   # unbound resolver used for all DNS queries by app, worker, etc that needs to ignore DNSSEC errors and pass them on to the client
   resolver-permissive:

diff --git a/documentation/Docker-deployment.md b/documentation/Docker-deployment.md
@@ -365,7 +365,7 @@ A Prometheus Alertmanager service is available but disabled by default. Enabling
 
 To enable and configure the Alertmanager add the following lines to `docker/local.env` and adjust the values to be applicable for your environment:
 
-    COMPOSE_PROFILES=default,cron,alertmanager
+    COMPOSE_PROFILES=connectiontest,cron,routinator,alertmanager
     [email protected],[email protected]
     [email protected]
     ALERTMANAGER_SMTP_HOST=smtp.example.com

diff --git a/documentation/Docker-development-environment.md b/documentation/Docker-development-environment.md
@@ -379,4 +379,8 @@ This project uses [Django Migrations](https://docs.djangoproject.com/en/4.2/topi
 
 ## Cron jobs
 
-There are various cron jobs configured during normal deployments that perform tasks not cricital to the functionality of the application. These can however hinder development as they add additional activity to the application or cause changes like restarting workers. Because of this they are disabled in `develop` environment. You can temporary enable them by adding the line `COMPOSE_PROFILES=default,cron` to `docker/local.env`.
+There are various cron jobs configured during normal deployments that perform tasks not cricital to the functionality of the application. These can however hinder development as they add additional activity to the application or cause changes like restarting workers. Because of this they are disabled in `develop` environment. You can temporary enable them by adding the line `COMPOSE_PROFILES=connectiontest,cron` to `docker/local.env`.
+
+## Routinator
+
+For the development environment the Routinator service/container is not started but instead an external routinator service is used. This reduces resource usage and wait time.