From fa18029fdf5f89a99d81343bf3bec91b2456a261 Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Tue, 16 Jun 2020 00:41:55 +0200 Subject: [PATCH] move to docker-compose.yml --- molecule/centos7/tests/test_default.py | 2 +- tasks/setup.yml | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/molecule/centos7/tests/test_default.py b/molecule/centos7/tests/test_default.py index e2f223d..5b62ff6 100644 --- a/molecule/centos7/tests/test_default.py +++ b/molecule/centos7/tests/test_default.py @@ -10,6 +10,6 @@ testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner( def test_droneci_compose_file(host): - f = host.file('/var/lib/docker/services/droneci/droneci.yml') + f = host.file('/var/lib/docker/services/droneci/docker-compose.yml') assert f.exists diff --git a/tasks/setup.yml b/tasks/setup.yml index f333544..4540dfc 100644 --- a/tasks/setup.yml +++ b/tasks/setup.yml @@ -13,7 +13,7 @@ - name: Deploy compose file to '{{ droneci_service_directory }}' template: src: "services/droneci_compose.yml.j2" - dest: "{{ droneci_service_directory }}/droneci.yml" + dest: "{{ droneci_service_directory }}/docker-compose.yml" owner: root group: root mode: 0640 @@ -29,8 +29,6 @@ - name: Ensure Drone is up and running docker_compose: project_src: "{{ droneci_service_directory }}" - files: - - droneci.yml pull: yes remove_orphans: yes stopped: "{{ droneci_service_stopped }}"