diff --git a/roles/docker-akaunting/vars/main.yml b/roles/docker-akaunting/vars/main.yml index e20e42db..bca7ceff 100644 --- a/roles/docker-akaunting/vars/main.yml +++ b/roles/docker-akaunting/vars/main.yml @@ -1,6 +1,5 @@ docker_compose_project_name: "akaunting" docker_compose_file_path: "{{docker_compose_instance_directory}}docker-compose.yml" -docker_compose_backup_path: "/tmp/{{docker_compose_project_name}}-docker-compose.yml.backup" database_type: "mariadb" database_password: "{{akaunting_database_password}}" repository_address: "https://github.com/akaunting/docker.git" diff --git a/roles/docker-attendize/vars/main.yml b/roles/docker-attendize/vars/main.yml index 99ee1203..3cb4e12a 100644 --- a/roles/docker-attendize/vars/main.yml +++ b/roles/docker-attendize/vars/main.yml @@ -1,7 +1,6 @@ --- docker_compose_project_name: "attendize" docker_compose_file_path: "{{docker_compose_instance_directory}}docker-compose.yml" -docker_compose_backup_path: "/tmp/{{docker_compose_project_name}}-docker-compose.yml.backup" mail_interface_domain: "mail.{{domain}}" database_type: "mariadb" database_password: "{{attendize_database_password}}" diff --git a/roles/docker-openproject/vars/main.yml b/roles/docker-openproject/vars/main.yml index 35ebef68..a663d197 100644 --- a/roles/docker-openproject/vars/main.yml +++ b/roles/docker-openproject/vars/main.yml @@ -2,7 +2,6 @@ docker_compose_project_name: "openproject" repository_directory: "{{ path_docker_compose_instances }}{{docker_compose_project_name}}/" docker_compose_instance_directory: "{{repository_directory}}compose/" docker_compose_file_path: "{{docker_compose_instance_directory}}docker-compose.yml" -docker_compose_backup_path: "/tmp/{{docker_compose_project_name}}-docker-compose.yml.backup" database_password: "{{openproject_database_password}}" repository_address: "https://github.com/opf/openproject-deploy" database_type: "postgres" diff --git a/roles/docker-taiga/tasks/main.yml b/roles/docker-taiga/tasks/main.yml index 308db9ca..13e105da 100644 --- a/roles/docker-taiga/tasks/main.yml +++ b/roles/docker-taiga/tasks/main.yml @@ -5,8 +5,13 @@ - name: "include tasks nginx-docker-proxy-domain.yml" include_tasks: nginx-docker-proxy-domain.yml -- name: "include tasks update-repository-with-docker-compose.yml" - include_tasks: update-repository-with-docker-compose.yml +- name: "include tasks update-repository-with-files.yml" + include_tasks: update-repository-with-files.yml + vars: + detached_files: + - .env + - docker-compose.yml + - docker-compose-init.yml - name: configure run.env template: src=env.j2 dest={{docker_compose_instance_directory}}/.env diff --git a/roles/docker-taiga/templates/env.j2 b/roles/docker-taiga/templates/.env.j2 similarity index 100% rename from roles/docker-taiga/templates/env.j2 rename to roles/docker-taiga/templates/.env.j2 diff --git a/roles/docker-taiga/vars/main.yml b/roles/docker-taiga/vars/main.yml index 409e617d..9f2e839a 100644 --- a/roles/docker-taiga/vars/main.yml +++ b/roles/docker-taiga/vars/main.yml @@ -1,6 +1,5 @@ docker_compose_project_name: "taigaio" docker_compose_file_path: "{{docker_compose_instance_directory}}docker-compose.yml" -docker_compose_backup_path: "/tmp/{{docker_compose_project_name}}-docker-compose.yml.backup" database_type: "postgres" database_password: "{{taigaio_database_password}}" repository_address: "https://github.com/taigaio/taiga-docker" diff --git a/tasks/update-repository-with-docker-compose.yml b/tasks/update-repository-with-docker-compose.yml index c26b4279..d98fe203 100644 --- a/tasks/update-repository-with-docker-compose.yml +++ b/tasks/update-repository-with-docker-compose.yml @@ -1,34 +1,5 @@ -- name: "backup docker-compose.yml if it exists" - command: > - mv "{{ docker_compose_file_path }}" "{{ docker_compose_backup_path }}" - args: - removes: "{{ docker_compose_file_path }}" - become: true - -- name: checkout repository - ansible.builtin.shell: git checkout . - become: true - args: - chdir: "{{docker_compose_instance_directory}}" - ignore_errors: true - -- name: pull docker repository - git: - repo: "{{ repository_address }}" - dest: "{{ repository_directory }}" - update: yes - notify: docker compose project setup - become: true - -- name: "restore docker-compose.yml from backup" - command: > - mv "{{ docker_compose_backup_path }}" "{{ docker_compose_file_path }}" - args: - removes: "{{ docker_compose_backup_path }}" - become: true - -- name: "copy docker-compose.yml" - template: - src: docker-compose.yml.j2 - dest: "{{ docker_compose_file_path }}" - notify: docker compose project setup \ No newline at end of file +- name: "include tasks update-repository-with-files.yml" + include_tasks: update-repository-with-files.yml + vars: + detached_files: + - "{{docker_compose_file_path}}" \ No newline at end of file diff --git a/tasks/update-repository-with-files.yml b/tasks/update-repository-with-files.yml new file mode 100644 index 00000000..f62aecf4 --- /dev/null +++ b/tasks/update-repository-with-files.yml @@ -0,0 +1,37 @@ +- name: "backup docker-compose.yml if it exists" + command: > + mv "{{docker_compose_instance_directory}}{{ item }}" "/tmp/{{docker_compose_project_name}}-{{ item }}.backup" + args: + removes: "{{docker_compose_instance_directory}}{{ item }}" + become: true + loop: "{{ detached_files }}" + +- name: checkout repository + ansible.builtin.shell: git checkout . + become: true + args: + chdir: "{{docker_compose_instance_directory}}" + ignore_errors: true + +- name: pull docker repository + git: + repo: "{{ repository_address }}" + dest: "{{ repository_directory }}" + update: yes + notify: docker compose project setup + become: true + +- name: "restore docker-compose.yml from backup" + command: > + mv "/tmp/{{docker_compose_project_name}}-{{ item }}.backup" "{{docker_compose_instance_directory}}{{ item }}" + args: + removes: "/tmp/{{docker_compose_project_name}}-{{ item }}.backup" + become: true + loop: "{{ detached_files }}" + +- name: "copy {{ item }}" + template: + src: "{{ item }}.j2" + dest: "{{docker_compose_instance_directory}}{{ item }}" + loop: "{{ detached_files }}" + notify: docker compose project setup