Upgrade Postgres, use Redis from Bitnami

.github/renovate.json5

@@ -17,10 +17,6 @@
   },
   baseBranches: ['master', '5.2', '5.1', '5.0', 'release_4'],
   'pre-commit': { enabled: true },
-  'docker-compose': {
-    enabled: true,
-    fileMatch: ['(^|/)docker-compose[^/]*\\.yaml$', 'acceptance_tests/tests/docker-compose[^/]*\\.yaml$'],
-  },
   regexManagers: [
     {
       fileMatch: ['^.pre-commit-config.yaml$'],

Makefile

@@ -33,7 +33,7 @@ tests: build_docker_test ## Run the unit tests
 acceptance: acceptance-in acceptance-out  ## Run the acceptance tests
 
 .PHONY: acceptance-run
-acceptance-run: tests build_redis_sentinal  ## Start the application used to run the acceptance tests
+acceptance-run: tests  ## Start the application used to run the acceptance tests
 	cd acceptance_tests/tests/; docker-compose up --detach db db_slave
 	cd acceptance_tests/tests/; docker-compose run -T --no-deps app /app/scripts/wait-db
 	cd acceptance_tests/tests/; docker-compose up --detach
@@ -63,10 +63,6 @@ build_docker_test:
 build_test_app: build_docker
 	docker build --tag=$(DOCKER_BASE)_test_app --build-arg="GIT_HASH=$(GIT_HASH)" acceptance_tests/app
 
-.PHONY: build_redis_sentinal
-build_redis_sentinal:
-	docker build --tag=$(DOCKER_BASE)-redis-sentinel:6 acceptance_tests/tests/redis/
-
 .PHONY: checks
 checks: prospector ## Run the checks
 

acceptance_tests/tests/docker-compose.yaml

@@ -121,7 +121,7 @@ services:
       - /app/run_alembic.sh
 
   db: &db
-    image: camptocamp/postgres:12
+    image: camptocamp/postgres:14-postgis-3
     environment:
       POSTGRES_USER: www-data
       POSTGRES_PASSWORD: www-data
@@ -189,22 +189,27 @@ services:
       - 9099:9090
 
   redis_master:
-    image: redis:6
+    image: bitnami/redis:7.0
+    environment:
+      - REDIS_REPLICATION_MODE=master
+      - ALLOW_EMPTY_PASSWORD=yes
 
   redis_slave:
-    image: redis:6
-    command: redis-server --slaveof redis_master 6379
+    image: bitnami/redis:7.0
+    environment:
+      - REDIS_REPLICATION_MODE=slave
+      - REDIS_MASTER_HOST=redis_master
+      - ALLOW_EMPTY_PASSWORD=yes
     depends_on:
       - redis_master
 
   # Sentinel
   redis:
-    image: camptocamp/c2cwsgiutils-redis-sentinel:6
+    image: bitnami/redis-sentinel:7.0
     environment:
-      - MASTER_NAME=mymaster
-      - QUORUM=1
-      - MASTER=redis_master
-      - SLAVES=redis_slave
+      - REDIS_MASTER_HOST=redis_master
+      - REDIS_MASTER_SET=mymaster
+      - ALLOW_EMPTY_PASSWORD=yes
     depends_on:
       - redis_master
       - redis_slave