move to docker-compose.yml

This commit is contained in:
Robert Kaussow 2020-06-16 00:41:55 +02:00
parent 42a82a6adb
commit fa18029fdf
No known key found for this signature in database
GPG Key ID: 65362AE74AF98B61
2 changed files with 2 additions and 4 deletions

View File

@ -10,6 +10,6 @@ testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner(
def test_droneci_compose_file(host): 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 assert f.exists

View File

@ -13,7 +13,7 @@
- name: Deploy compose file to '{{ droneci_service_directory }}' - name: Deploy compose file to '{{ droneci_service_directory }}'
template: template:
src: "services/droneci_compose.yml.j2" src: "services/droneci_compose.yml.j2"
dest: "{{ droneci_service_directory }}/droneci.yml" dest: "{{ droneci_service_directory }}/docker-compose.yml"
owner: root owner: root
group: root group: root
mode: 0640 mode: 0640
@ -29,8 +29,6 @@
- name: Ensure Drone is up and running - name: Ensure Drone is up and running
docker_compose: docker_compose:
project_src: "{{ droneci_service_directory }}" project_src: "{{ droneci_service_directory }}"
files:
- droneci.yml
pull: yes pull: yes
remove_orphans: yes remove_orphans: yes
stopped: "{{ droneci_service_stopped }}" stopped: "{{ droneci_service_stopped }}"