Merge branch 'dev' into staging

deNBI · Jan 18, 2022 · c66d4c4 · c66d4c4
2 parents d3dd2b3 + 41369aa
commit c66d4c4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/dev/docker-compose.override.yml b/dev/docker-compose.override.yml
@@ -187,7 +187,7 @@ services:
       - MAIL_SMTP_SERVER=portal_smtp_server
 
   smtp_server:
-    image: "python:3.7-alpine"
+    image: "python:3.10-alpine"
     container_name: portal_smtp_server
     command: python3 -m smtpd -n -c DebuggingServer 0.0.0.0:25
     environment:

diff --git a/docker-compose.site.yml b/docker-compose.site.yml
@@ -51,7 +51,7 @@ services:
     # use the one below to have haproxy debug log directly to stdout including
     # every request with auth headers
     # image: mminks/haproxy-docker-logging:latest
-    image: "haproxy:2.5.0-alpine"
+    image: "haproxy:2.5.1-alpine"
     # use self build Dockerfile as alternative
     # build: prod/haproxy
     container_name: project_usage_proxy