diff --git a/inventories/chaosknoten/host_vars/cloud.yaml b/inventories/chaosknoten/host_vars/cloud.yaml index 8f299b2d..c4164a77 100644 --- a/inventories/chaosknoten/host_vars/cloud.yaml +++ b/inventories/chaosknoten/host_vars/cloud.yaml @@ -1,7 +1,7 @@ # renovate: datasource=docker depName=git.hamburg.ccc.de/ccchh/oci-images/nextcloud nextcloud__version: 34 # renovate: datasource=docker depName=docker.io/library/postgres -nextcloud__postgres_version: 15.18 +nextcloud__postgres_version: 18.6 nextcloud__fqdn: cloud.hamburg.ccc.de nextcloud__data_dir: /data/nextcloud nextcloud__extra_configuration: "{{ lookup('ansible.builtin.template', 'resources/chaosknoten/cloud/nextcloud/extra_configuration.config.php.j2') }}" diff --git a/resources/chaosknoten/ccchoir/docker_compose/compose.yaml.j2 b/resources/chaosknoten/ccchoir/docker_compose/compose.yaml.j2 index 00cac00e..72d898fa 100644 --- a/resources/chaosknoten/ccchoir/docker_compose/compose.yaml.j2 +++ b/resources/chaosknoten/ccchoir/docker_compose/compose.yaml.j2 @@ -16,24 +16,24 @@ services: backend: restart: unless-stopped -# app: -# image: docker.io/library/wordpress:7-php8.2 -# environment: -# - "WORDPRESS_DB_HOST=database" -# - "WORDPRESS_DB_NAME=wordpress" -# - "WORDPRESS_DB_USER=wordpress" -# - "WORDPRESS_TABLE_PREFIX=wp_" -# - "WORDPRESS_DB_PASSWORD={{ secret__wordpress_db_password }}" -# volumes: -# - wordpress:/var/www/html/wp-content -# ports: -# - "127.0.0.1:3000:80" -# networks: -# backend: -# frontend: -# restart: unless-stopped -# depends_on: -# - database + app: + image: docker.io/library/wordpress:7-php8.2 + environment: + - "WORDPRESS_DB_HOST=database" + - "WORDPRESS_DB_NAME=wordpress" + - "WORDPRESS_DB_USER=wordpress" + - "WORDPRESS_TABLE_PREFIX=wp_" + - "WORDPRESS_DB_PASSWORD={{ secret__wordpress_db_password }}" + volumes: + - wordpress:/var/www/html/wp-content + ports: + - "127.0.0.1:3000:80" + networks: + backend: + frontend: + restart: unless-stopped + depends_on: + - database volumes: database: {} diff --git a/resources/chaosknoten/lists/docker_compose/compose.yaml.j2 b/resources/chaosknoten/lists/docker_compose/compose.yaml.j2 index 7a109e8c..fc1cb194 100644 --- a/resources/chaosknoten/lists/docker_compose/compose.yaml.j2 +++ b/resources/chaosknoten/lists/docker_compose/compose.yaml.j2 @@ -62,7 +62,7 @@ services: - POSTGRES_DB=mailmandb - POSTGRES_USER=mailman - "POSTGRES_PASSWORD={{ secret__lists__postgres_password }}" - image: docker.io/library/postgres:12-alpine + image: docker.io/library/postgres:18-alpine volumes: - /opt/mailman/database:/var/lib/postgresql/data networks: diff --git a/resources/chaosknoten/pretalx/docker_compose/compose.yaml.j2 b/resources/chaosknoten/pretalx/docker_compose/compose.yaml.j2 index 6b1683cc..9830f909 100644 --- a/resources/chaosknoten/pretalx/docker_compose/compose.yaml.j2 +++ b/resources/chaosknoten/pretalx/docker_compose/compose.yaml.j2 @@ -3,7 +3,7 @@ services: database: - image: docker.io/library/postgres:15-alpine + image: docker.io/library/postgres:18-alpine environment: - "POSTGRES_USER=pretalx" - "POSTGRES_PASSWORD={{ secret__pretalx_db_password }}" @@ -23,7 +23,7 @@ services: - pretalx_net static: - image: docker.io/library/nginx:1.31.7 + image: docker.io/library/nginx:1.31.8 restart: unless-stopped volumes: - public:/usr/share/nginx/html