fixed various bugs with the docker-image role

This commit is contained in:
Christian Rebischke 2018-05-31 19:27:10 +02:00 committed by Florian Pritz
parent 37ca74b8c0
commit 7b6ec205f4
3 changed files with 12 additions and 8 deletions

View file

@ -0,0 +1,4 @@
---
- name: daemon reload
command: systemctl daemon-reload

View file

@ -12,15 +12,15 @@
- name: adjust permissions of git checkout
file: path="{{ docker_image_git_dir }}" state=directory recurse=yes owner="{{ docker_image_user }}" group="{{ docker_image_user }}"
- name: install docker_image_build service
template: src='docker-image-build.service.j2' dest='/etc/systemd/system/docker-image-build.service' owner=root group=root mode=0644
- name: install docker_image service
template: src='docker-image.service.j2' dest='/etc/systemd/system/docker-image.service' owner=root group=root mode=0644
notify:
- daemon reload
- name: install docker_image_build timer
template: src='docker-image-build.timer.j2' dest='/etc/systemd/system/docker-image-build.timer' owner=root group=root mode=0644
- name: install docker_image timer
template: src='docker-image.timer.j2' dest='/etc/systemd/system/docker-image.timer' owner=root group=root mode=0644
notify:
- daemon reload
- name: start and enable docker_image_build timer
service: name='docker-image-build.timer' enabled=yes state=started
service: name='docker-image.timer' enabled=yes state=started

View file

@ -3,6 +3,6 @@ Description=docker-image service for building
[Service]
Type=oneshot
ExecStart=/usr/bin/make -C {{ archboxes_git_dir }} rootfs
User={{ archboxes_user }}
WorkingDirectory={{ archboxes_git_dir }}
ExecStart=/usr/bin/make -C {{ docker_image_git_dir }} rootfs
User={{ docker_image_user }}
WorkingDirectory={{ docker_image_git_dir }}