diff --git a/roles/openproject/defaults/main.yml b/roles/openproject/defaults/main.yml index e32fd7a..fbed1cb 100644 --- a/roles/openproject/defaults/main.yml +++ b/roles/openproject/defaults/main.yml @@ -2,9 +2,9 @@ openproject_base_path: "/opt/openproject" openproject_upstream_git_url: "https://github.com/opf/openproject-deploy.git" -openproject_upstream_git_branch: "stable/13" +openproject_upstream_git_branch: "stable/14" -openproject_compose_project_path: "{{ openproject_base_path }}/compose" +openproject_compose_project_path: "{{ openproject_base_path }}" openproject_compose_project_name: "openproject" openproject_compose_project_env_file: "{{ openproject_compose_project_path }}/.env" openproject_compose_project_override_file: "{{ openproject_compose_project_path }}/docker-compose.override.yml" diff --git a/roles/openproject/tasks/main.yml b/roles/openproject/tasks/main.yml index cd60b32..dcc1042 100644 --- a/roles/openproject/tasks/main.yml +++ b/roles/openproject/tasks/main.yml @@ -26,14 +26,13 @@ content: "{{ openproject_compose_overrides | default({}) | to_nice_yaml }}" - name: Ensure containers are pulled - community.docker.docker_compose: + community.docker.docker_compose_v2: project_src: "{{ openproject_compose_project_path }}" project_name: "{{ openproject_compose_project_name }}" - pull: true + pull: "missing" - name: Ensure services are running - community.docker.docker_compose: + community.docker.docker_compose_v2: project_src: "{{ openproject_compose_project_path }}" project_name: "{{ openproject_compose_project_name }}" state: "present" - build: false