diff --git a/defaults/main.yml b/defaults/main.yml index 6a62cb1..85513c7 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -58,3 +58,5 @@ droneci_gitea_skip_verify: False # @var droneci_no_proxy: $ ["drone-server", "drone-agent"] droneci_no_proxy: [] + +droneci_docker_compose_bin: /usr/local/bin/docker-compose diff --git a/tasks/setup.yml b/tasks/setup.yml index 6d36b13..e0306c8 100644 --- a/tasks/setup.yml +++ b/tasks/setup.yml @@ -17,6 +17,7 @@ owner: root group: root mode: 0644 + validate: "{{ droneci_docker_compose_bin }} -f %s config -q" notify: __drone_restart - name: Create systemd unit files diff --git a/templates/etc/systemd/system/drone.service.j2 b/templates/etc/systemd/system/drone.service.j2 index 3e773c2..cb33ede 100644 --- a/templates/etc/systemd/system/drone.service.j2 +++ b/templates/etc/systemd/system/drone.service.j2 @@ -9,11 +9,11 @@ After=docker.service Restart={{ droneci_restart_policy }} WorkingDirectory={{ droneci_service_directory }} -ExecStartPre=/usr/local/bin/docker-compose down -ExecStartPre=/usr/local/bin/docker-compose rm -f +ExecStartPre={{ droneci_docker_compose_bin }} down +ExecStartPre={{ droneci_docker_compose_bin }} rm -f -ExecStart=/usr/local/bin/docker-compose up -ExecStop=/usr/local/bin/docker-compose down +ExecStart={{ droneci_docker_compose_bin }} up +ExecStop={{ droneci_docker_compose_bin }} down [Install] WantedBy=multi-user.target