Compare commits
2 commits
c47f7eeee2
...
077b3b9eb7
| Author | SHA1 | Date | |
|---|---|---|---|
| 077b3b9eb7 | |||
|
2b5f261cd3 |
12 changed files with 59 additions and 14 deletions
|
|
@ -1,7 +1,7 @@
|
||||||
# renovate: datasource=docker depName=git.hamburg.ccc.de/ccchh/oci-images/nextcloud
|
# renovate: datasource=docker depName=git.hamburg.ccc.de/ccchh/oci-images/nextcloud
|
||||||
nextcloud__version: 32
|
nextcloud__version: 32
|
||||||
# renovate: datasource=docker depName=docker.io/library/postgres
|
# renovate: datasource=docker depName=docker.io/library/postgres
|
||||||
nextcloud__postgres_version: 15.15
|
nextcloud__postgres_version: 18.3
|
||||||
nextcloud__fqdn: cloud.hamburg.ccc.de
|
nextcloud__fqdn: cloud.hamburg.ccc.de
|
||||||
nextcloud__data_dir: /data/nextcloud
|
nextcloud__data_dir: /data/nextcloud
|
||||||
nextcloud__extra_configuration: "{{ lookup('ansible.builtin.template', 'resources/chaosknoten/cloud/nextcloud/extra_configuration.config.php.j2') }}"
|
nextcloud__extra_configuration: "{{ lookup('ansible.builtin.template', 'resources/chaosknoten/cloud/nextcloud/extra_configuration.config.php.j2') }}"
|
||||||
|
|
|
||||||
|
|
@ -46,7 +46,7 @@ services:
|
||||||
- "8080:8080"
|
- "8080:8080"
|
||||||
|
|
||||||
db:
|
db:
|
||||||
image: docker.io/library/postgres:15.15
|
image: docker.io/library/postgres:18.3
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
networks:
|
networks:
|
||||||
- keycloak
|
- keycloak
|
||||||
|
|
|
||||||
|
|
@ -58,7 +58,7 @@ services:
|
||||||
- POSTGRES_DB=mailmandb
|
- POSTGRES_DB=mailmandb
|
||||||
- POSTGRES_USER=mailman
|
- POSTGRES_USER=mailman
|
||||||
- POSTGRES_PASSWORD=wvQjbMRnwFuxGEPz
|
- POSTGRES_PASSWORD=wvQjbMRnwFuxGEPz
|
||||||
image: docker.io/library/postgres:12-alpine
|
image: docker.io/library/postgres:18-alpine
|
||||||
volumes:
|
volumes:
|
||||||
- /opt/mailman/database:/var/lib/postgresql/data
|
- /opt/mailman/database:/var/lib/postgresql/data
|
||||||
networks:
|
networks:
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,7 @@
|
||||||
|
|
||||||
services:
|
services:
|
||||||
database:
|
database:
|
||||||
image: docker.io/library/postgres:15-alpine
|
image: docker.io/library/postgres:18-alpine
|
||||||
environment:
|
environment:
|
||||||
- "POSTGRES_USER=hedgedoc"
|
- "POSTGRES_USER=hedgedoc"
|
||||||
- "POSTGRES_PASSWORD={{ secret__hedgedoc_db_password }}"
|
- "POSTGRES_PASSWORD={{ secret__hedgedoc_db_password }}"
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,7 @@
|
||||||
|
|
||||||
services:
|
services:
|
||||||
database:
|
database:
|
||||||
image: docker.io/library/postgres:15-alpine
|
image: docker.io/library/postgres:18-alpine
|
||||||
environment:
|
environment:
|
||||||
- "POSTGRES_USER=pretalx"
|
- "POSTGRES_USER=pretalx"
|
||||||
- "POSTGRES_PASSWORD={{ secret__pretalx_db_password }}"
|
- "POSTGRES_PASSWORD={{ secret__pretalx_db_password }}"
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
---
|
---
|
||||||
services:
|
services:
|
||||||
database:
|
database:
|
||||||
image: docker.io/library/postgres:15-alpine
|
image: docker.io/library/postgres:18-alpine
|
||||||
environment:
|
environment:
|
||||||
- "POSTGRES_USER=pretix"
|
- "POSTGRES_USER=pretix"
|
||||||
- "POSTGRES_PASSWORD={{ secret__pretix_db_password }}"
|
- "POSTGRES_PASSWORD={{ secret__pretix_db_password }}"
|
||||||
|
|
|
||||||
8
roles/docker/files/docker-cleanup.service
Normal file
8
roles/docker/files/docker-cleanup.service
Normal file
|
|
@ -0,0 +1,8 @@
|
||||||
|
[Unit]
|
||||||
|
Description=cleanup unused docker data
|
||||||
|
After=network-online.target docker.service
|
||||||
|
Wants=network-online.target docker.service
|
||||||
|
|
||||||
|
[Service]
|
||||||
|
Type=oneshot
|
||||||
|
ExecStart=/usr/bin/docker system prune --all --force
|
||||||
9
roles/docker/files/docker-cleanup.timer
Normal file
9
roles/docker/files/docker-cleanup.timer
Normal file
|
|
@ -0,0 +1,9 @@
|
||||||
|
[Unit]
|
||||||
|
Description=cleanup unused docker data every day
|
||||||
|
|
||||||
|
[Timer]
|
||||||
|
OnCalendar=daily
|
||||||
|
RandomizedDelaySec=1h
|
||||||
|
|
||||||
|
[Install]
|
||||||
|
WantedBy=timers.target
|
||||||
4
roles/docker/handlers/main.yaml
Normal file
4
roles/docker/handlers/main.yaml
Normal file
|
|
@ -0,0 +1,4 @@
|
||||||
|
- name: systemd daemon reload
|
||||||
|
ansible.builtin.systemd_service:
|
||||||
|
daemon_reload: true
|
||||||
|
become: true
|
||||||
|
|
@ -9,3 +9,7 @@
|
||||||
- name: Ensure Docker daemon configuration
|
- name: Ensure Docker daemon configuration
|
||||||
ansible.builtin.import_tasks:
|
ansible.builtin.import_tasks:
|
||||||
file: main/03_docker_config.yaml
|
file: main/03_docker_config.yaml
|
||||||
|
|
||||||
|
- name: Ensure automatic cleanup of unused Docker data is set up
|
||||||
|
ansible.builtin.import_tasks:
|
||||||
|
file: main/04_docker_auto_cleanup.yaml
|
||||||
|
|
|
||||||
28
roles/docker/tasks/main/04_docker_auto_cleanup.yaml
Normal file
28
roles/docker/tasks/main/04_docker_auto_cleanup.yaml
Normal file
|
|
@ -0,0 +1,28 @@
|
||||||
|
- name: ensure systemd service exists
|
||||||
|
ansible.builtin.copy:
|
||||||
|
src: docker-cleanup.service
|
||||||
|
dest: /etc/systemd/system/docker-cleanup.service
|
||||||
|
owner: root
|
||||||
|
group: root
|
||||||
|
mode: "0644"
|
||||||
|
become: true
|
||||||
|
notify:
|
||||||
|
- systemd daemon reload
|
||||||
|
|
||||||
|
- name: ensure systemd timer exists
|
||||||
|
ansible.builtin.copy:
|
||||||
|
src: docker-cleanup.timer
|
||||||
|
dest: /etc/systemd/system/docker-cleanup.timer
|
||||||
|
owner: root
|
||||||
|
group: root
|
||||||
|
mode: "0644"
|
||||||
|
become: true
|
||||||
|
notify:
|
||||||
|
- systemd daemon reload
|
||||||
|
|
||||||
|
- name: ensure systemd timer is started and enabled
|
||||||
|
ansible.builtin.systemd_service:
|
||||||
|
name: docker-cleanup.timer
|
||||||
|
state: started
|
||||||
|
enabled: true
|
||||||
|
become: true
|
||||||
|
|
@ -108,11 +108,3 @@
|
||||||
minute: "0"
|
minute: "0"
|
||||||
hour: "5"
|
hour: "5"
|
||||||
job: "cd /ansible_docker_compose; docker compose pull && docker compose up -d"
|
job: "cd /ansible_docker_compose; docker compose pull && docker compose up -d"
|
||||||
|
|
||||||
- name: ensure automatic cleanup cron job is present
|
|
||||||
become: true
|
|
||||||
ansible.builtin.cron:
|
|
||||||
name: 'ansible docker compose auto cleanup'
|
|
||||||
minute: "23"
|
|
||||||
hour: "4"
|
|
||||||
job: "docker system prune -a -f"
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue