Skip to content

Commit 8d305b3

Browse files
authored
Merge pull request #251 from devilbox/release-0.144
Release 0.144
2 parents cb046dd + 9c4490f commit 8d305b3

File tree

527 files changed

+13916
-3429
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

527 files changed

+13916
-3429
lines changed
File renamed without changes.
File renamed without changes.
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
[defaults]
22
roles_path = ./roles
3-
inventory = inventory
3+
inventory = inventory.ini
File renamed without changes.

build/ansible/group_vars/all/all-ansible.yml .ansible/group_vars/all/all-ansible.yml

+12-12
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
# Ansible specific definitions
44
###################################################################################################
55

6-
edit_comment_base: "# Auto-generated via Ansible: edit build/ansible/DOCKERFILES/Dockerfile-base.j2 instead."
7-
edit_comment_mods: "# Auto-generated via Ansible: edit build/ansible/DOCKERFILES/Dockerfile-mods.j2 instead."
8-
edit_comment_prod: "# Auto-generated via Ansible: edit build/ansible/DOCKERFILES/Dockerfile-prod.j2 instead."
9-
edit_comment_work: "# Auto-generated via Ansible: edit build/ansible/DOCKERFILES/Dockerfile-work.j2 instead."
6+
edit_comment_base: "# Auto-generated via Ansible: edit ./ansible/DOCKERFILES/Dockerfile-base.j2 instead."
7+
edit_comment_mods: "# Auto-generated via Ansible: edit ./ansible/DOCKERFILES/Dockerfile-mods.j2 instead."
8+
edit_comment_prod: "# Auto-generated via Ansible: edit ./ansible/DOCKERFILES/Dockerfile-prod.j2 instead."
9+
edit_comment_work: "# Auto-generated via Ansible: edit ./ansible/DOCKERFILES/Dockerfile-work.j2 instead."
1010

1111

1212
# -------------------------------------------------------------------------------------------------
@@ -42,13 +42,13 @@ php_all_versions:
4242
# -------------------------------------------------------------------------------------------------
4343
template_dockerfiles:
4444
- src: DOCKERFILES/Dockerfile-base.j2
45-
dst: "../../Dockerfiles/base/Dockerfile-{{ php_version }}"
45+
dst: "../Dockerfiles/base/Dockerfile-{{ php_version }}"
4646
- src: DOCKERFILES/Dockerfile-mods.j2
47-
dst: "../../Dockerfiles/mods/Dockerfile-{{ php_version }}"
47+
dst: "../Dockerfiles/mods/Dockerfile-{{ php_version }}"
4848
- src: DOCKERFILES/Dockerfile-prod.j2
49-
dst: "../../Dockerfiles/prod/Dockerfile-{{ php_version }}"
49+
dst: "../Dockerfiles/prod/Dockerfile-{{ php_version }}"
5050
- src: DOCKERFILES/Dockerfile-work.j2
51-
dst: "../../Dockerfiles/work/Dockerfile-{{ php_version }}"
51+
dst: "../Dockerfiles/work/Dockerfile-{{ php_version }}"
5252

5353

5454
# -------------------------------------------------------------------------------------------------
@@ -57,23 +57,23 @@ template_dockerfiles:
5757
template_configurations:
5858
# php.ini
5959
- src: CONFIGURATIONS/php.ini.j2
60-
dst: "../../Dockerfiles/base/data/php-ini.d/php-{{ php_version }}.ini"
60+
dst: "../Dockerfiles/base/data/php-ini.d/php-{{ php_version }}.ini"
6161
cfg: "{{ php_settings_ini }}"
6262
key: base
6363
alt: base
6464
- src: CONFIGURATIONS/php.ini.j2
65-
dst: "../../Dockerfiles/work/data/php-ini.d/php-{{ php_version }}.ini"
65+
dst: "../Dockerfiles/work/data/php-ini.d/php-{{ php_version }}.ini"
6666
cfg: "{{ php_settings_ini }}"
6767
key: work
6868
alt: base # Alternative key to use when definition is not set in 'work'
6969
# php-fpm.conf
7070
- src: CONFIGURATIONS/php-fpm.conf.j2
71-
dst: "../../Dockerfiles/base/data/php-fpm.conf/php-fpm-{{ php_version }}.conf"
71+
dst: "../Dockerfiles/base/data/php-fpm.conf/php-fpm-{{ php_version }}.conf"
7272
cfg: "{{ php_settings_fpm }}"
7373
key: base
7474
alt: base
7575
- src: CONFIGURATIONS/php-fpm.conf.j2
76-
dst: "../../Dockerfiles/work/data/php-fpm.conf/php-fpm-{{ php_version }}.conf"
76+
dst: "../Dockerfiles/work/data/php-fpm.conf/php-fpm-{{ php_version }}.conf"
7777
cfg: "{{ php_settings_fpm }}"
7878
key: work
7979
alt: base

0 commit comments

Comments
 (0)