diff --git a/README.md b/README.md index 789cf93..c5822eb 100644 --- a/README.md +++ b/README.md @@ -94,4 +94,9 @@ The order of deployment is: - site.yaml - harden.yaml -For further deployment and system maintenance we have a `Makefile` which automates Docker Compose tasks. +For further deployment and system maintenance we have a `Makefile` which automates Docker Compose tasks. This should be converted to use [Ansible Container](http://docs.ansible.com/ansible-container/getting_started.html). In the meantime, start a release with Ansible, then complete it using `make`, i.e.: + +``` +ansible-playbook -s ansible/site.yaml -i ansible/inventories/production --tags release +ssh -i .keys/ansible.pem ansible@ "cd && make" +``` diff --git a/ansible/roles/web/tasks/main.yaml b/ansible/roles/web/tasks/main.yaml index ce13699..7cf0ac2 100644 --- a/ansible/roles/web/tasks/main.yaml +++ b/ansible/roles/web/tasks/main.yaml @@ -16,3 +16,7 @@ - frontend - nodejs - setup + +- include: release.yaml + tags: + - release diff --git a/ansible/roles/web/tasks/release.yaml b/ansible/roles/web/tasks/release.yaml new file mode 100644 index 0000000..a58880e --- /dev/null +++ b/ansible/roles/web/tasks/release.yaml @@ -0,0 +1,16 @@ +--- + +- name: Checkout code branch from git + git: + repo: 'https://github.com/datalets/public-health-ch' + dest: "{{ release_dir }}" + force: yes + +- name: Copy Docker site configuration + template: + src: docker-compose.j2 + dest: "{{ release_dir }}/docker-compose.yml" + +- name: Update Docker site + debug: + msg: "Please run 'make' in {{ release_dir }} to finish updating the site"