Removed anonymous volumes

This commit is contained in:
Kevin Veen-Birkenbach 2024-01-13 21:38:02 +01:00
parent bb9daf27e5
commit 5d1ac3c17c
7 changed files with 34 additions and 14 deletions

View File

@ -12,22 +12,39 @@
replace: replace:
path: "{{docker_compose_file}}" path: "{{docker_compose_file}}"
regexp: '\./postgres-data:/var/lib/postgresql/data' regexp: '\./postgres-data:/var/lib/postgresql/data'
replace: 'postgres-data:/var/lib/postgresql/data' replace: 'database:/var/lib/postgresql/data'
listen: setup bigbluebutton listen: setup bigbluebutton
- name: replace greenlight bind mount by volume mount - name: replace greenlight bind mount by volume mount
replace: replace:
path: "{{docker_compose_file}}" path: "{{docker_compose_file}}"
regexp: '\./greenlight-data:/usr/src/app/storage' regexp: '\./greenlight-data:/usr/src/app/storage'
replace: 'greenlight-data:/usr/src/app/storage' replace: 'greenlight:/usr/src/app/storage'
listen: setup bigbluebutton
- name: add volume to redis
lineinfile:
path: "{{ docker_compose_file }}"
insertafter: "^\\s*redis:"
line: " volumes:\n - redis:/data"
firstmatch: yes
listen: setup bigbluebutton
- name: add volume to coturn
lineinfile:
path: "{{ docker_compose_file }}"
insertafter: "- ./mod/coturn/turnserver.conf:/etc/coturn/turnserver.conf"
line: " - coturn:/var/lib/coturn"
listen: setup bigbluebutton listen: setup bigbluebutton
- name: add volumes to docker compose - name: add volumes to docker compose
blockinfile: blockinfile:
path: "{{docker_compose_file}}" path: "{{docker_compose_file}}"
block: |2 block: |2
postgres-data: database:
greenlight-data: greenlight:
redis:
coturn:
marker: "# {mark} ANSIBLE MANAGED BLOCK FOR VOLUMES" marker: "# {mark} ANSIBLE MANAGED BLOCK FOR VOLUMES"
insertafter: "html5-static:" insertafter: "html5-static:"
listen: setup bigbluebutton listen: setup bigbluebutton

View File

@ -50,4 +50,4 @@
- name: print admin user data - name: print admin user data
debug: debug:
msg: "{{ admin_creation_result.stdout }}" msg: "{{ admin_creation_result.stdout }}"
when: admin_creation_result is defined when: mode_setup | bool

View File

@ -1,5 +1,5 @@
docker_compose_project_name: "bigbluebutton" docker_compose_project_name: "bigbluebutton"
docker_compose_file: "{{docker_compose_instance_directory}}/docker-compose.yml" docker_compose_file: "{{docker_compose_instance_directory}}docker-compose.yml"
database_instance: "bigbluebutton" database_instance: "bigbluebutton"
database_name: "greenlight-v3" database_name: "greenlight-v3"
database_username: "postgres" database_username: "postgres"

View File

@ -4,11 +4,6 @@
state: present state: present
when: run_once_docker_mariadb is not defined when: run_once_docker_mariadb is not defined
- name: Create a volume for MariaDB socket
docker_volume:
name: mariadb_socket
when: run_once_docker_mariadb is not defined
- name: install MariaDB - name: install MariaDB
docker_container: docker_container:
name: central-mariadb name: central-mariadb

View File

@ -8,6 +8,12 @@
- name: "include tasks update-repository-with-docker-compose.yml" - name: "include tasks update-repository-with-docker-compose.yml"
include_tasks: update-repository-with-docker-compose.yml include_tasks: update-repository-with-docker-compose.yml
- name: "create {{dummy_volume}}"
file:
path: "{{dummy_volume}}"
state: directory
mode: 0755
- name: "copy .env" - name: "copy .env"
template: template:
src: env.j2 src: env.j2

View File

@ -17,7 +17,7 @@ x-op-app: &app
IMAP_ENABLED: "${IMAP_ENABLED:-false}" IMAP_ENABLED: "${IMAP_ENABLED:-false}"
volumes: volumes:
- "data:/var/openproject/assets" - "data:/var/openproject/assets"
# - "database:/var/openproject/pgdata" - "{{dummy_volume}}:/var/openproject/pgdata" # This mount is unnecessary and just done to prevent anonymous volumes
services: services:
@ -42,7 +42,7 @@ services:
{% include 'templates/docker-container-networks.yml.j2' %} {% include 'templates/docker-container-networks.yml.j2' %}
volumes: volumes:
- "data:/var/openproject/assets" - "data:/var/openproject/assets"
# - "database:/var/openproject/pgdata" Should definetly not be necessary here - "{{dummy_volume}}:/var/openproject/pgdata" # This mount is unnecessary and just done to prevent anonymous volumes
web: web:
<<: *app <<: *app

View File

@ -5,4 +5,6 @@ docker_compose_file_path: "{{docker_compose_instance_directory}}docker
docker_compose_backup_path: "/tmp/{{docker_compose_project_name}}-docker-compose-backup.yml" docker_compose_backup_path: "/tmp/{{docker_compose_project_name}}-docker-compose-backup.yml"
database_password: "{{openproject_database_password}}" database_password: "{{openproject_database_password}}"
repository_address: "https://github.com/opf/openproject-deploy" repository_address: "https://github.com/opf/openproject-deploy"
database_type: "postgres" database_type: "postgres"
# The following volume doesn't have a function. It just exist to prevent the creation of unnecessary anonymous volumes
dummy_volume: "{{repository_directory}}dummy_volume"