Skip to content

Commit 9847d9b

Browse files
committed
fix(ansible): allow to execute playbook for single image
1 parent 18a078d commit 9847d9b

File tree

4 files changed

+53
-11
lines changed

4 files changed

+53
-11
lines changed
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
3+
process:
4+
php-fpm:
5+
running: true
6+
7+
...
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
3+
process:
4+
supervisord:
5+
running: true
6+
7+
...

src/group_vars/dev.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,14 @@ tpl_configs:
3232
tpl_docker_tests:
3333
- src: Dockerfiles/dev/goss.yaml.j2
3434
dst: "../dist/dev/{{ php_version }}-{{ php_type }}-{{ os_name }}/goss.yaml"
35-
- src: Dockerfiles/dev/goss_wait.yaml
36-
dst: "../dist/dev/{{ php_version }}-supervisord-{{ os_name }}/goss_wait.yaml"
3735

36+
tpl_docker_fpm_tests:
37+
- src: Dockerfiles/dev/goss_wait_fpm.yaml
38+
dst: "../dist/dev/{{ php_version }}-fpm-{{ os_name }}/goss_wait.yaml"
39+
40+
tpl_docker_supervisord_tests:
41+
- src: Dockerfiles/dev/goss_wait_supervisord.yaml
42+
dst: "../dist/dev/{{ php_version }}-supervisord-{{ os_name }}/goss_wait.yaml"
3843

3944
# Enabled extensions
4045
########################################################################################################################

src/roles/dev/main.yml

Lines changed: 32 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,62 @@
11
---
22

33
- name: Create dev directories
4-
file:
4+
ansible.builtin.file:
55
path: "{{ item.path }}"
66
state: directory
7-
mode: 0775
7+
mode: "0775"
88
recurse: true
99
with_items:
1010
- "{{ tpl_directories }}"
1111

1212
- name: Generate Dockerfiles
13-
template:
13+
ansible.builtin.template:
1414
src: "{{ item.src }}"
1515
dest: "{{ item.dst }}"
1616
force: true
17-
mode: 0644
17+
mode: "0644"
1818
with_items:
1919
- "{{ tpl_dockerfiles }}"
2020

2121
- name: Generate PHP configuration files
22-
template:
22+
ansible.builtin.template:
2323
src: "{{ item.src }}"
2424
dest: "{{ item.dst }}"
2525
force: true
26-
mode: 0644
26+
mode: "0644"
2727
with_items:
2828
- "{{ tpl_configs }}"
2929

30-
- name: Generate Dockerfile Goss tests
31-
template:
30+
- name: Generate Dockerfile Goss tests for non-supervisord
31+
ansible.builtin.template:
3232
src: "{{ item.src }}"
3333
dest: "{{ item.dst }}"
3434
force: true
35-
mode: 0644
35+
mode: "0644"
3636
with_items:
3737
- "{{ tpl_docker_tests }}"
38+
when: php_type == 'cli'
39+
40+
- name: Generate Dockerfile Goss tests for fpm
41+
ansible.builtin.template:
42+
src: "{{ item.src }}"
43+
dest: "{{ item.dst }}"
44+
force: true
45+
mode: "0644"
46+
with_items:
47+
- "{{ tpl_docker_tests }}"
48+
- "{{ tpl_docker_fpm_tests }}"
49+
when: php_type == 'fpm'
50+
51+
- name: Generate Dockerfile Goss tests for supervisord
52+
ansible.builtin.template:
53+
src: "{{ item.src }}"
54+
dest: "{{ item.dst }}"
55+
force: true
56+
mode: "0644"
57+
with_items:
58+
- "{{ tpl_docker_tests }}"
59+
- "{{ tpl_docker_supervisord_tests }}"
60+
when: php_type == 'supervisord'
3861

3962
...

0 commit comments

Comments
 (0)