Skip to content

Commit 0126289

Browse files
committed
Split out tools
1 parent 101e8ab commit 0126289

File tree

115 files changed

+15540
-11756
lines changed

Some content is hidden

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

115 files changed

+15540
-11756
lines changed

.ansible/DOCKERFILES/Dockerfile-slim.j2

+402
Large diffs are not rendered by default.

.ansible/DOCKERFILES/Dockerfile-work.j2

+449-507
Large diffs are not rendered by default.

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

+12-7
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
edit_comment_base: "# Auto-generated via Ansible: edit ./ansible/DOCKERFILES/Dockerfile-base.j2 instead."
77
edit_comment_mods: "# Auto-generated via Ansible: edit ./ansible/DOCKERFILES/Dockerfile-mods.j2 instead."
88
edit_comment_prod: "# Auto-generated via Ansible: edit ./ansible/DOCKERFILES/Dockerfile-prod.j2 instead."
9+
edit_comment_slim: "# Auto-generated via Ansible: edit ./ansible/DOCKERFILES/Dockerfile-slim.j2 instead."
910
edit_comment_work: "# Auto-generated via Ansible: edit ./ansible/DOCKERFILES/Dockerfile-work.j2 instead."
1011

1112

@@ -38,7 +39,7 @@ php_all_versions:
3839

3940

4041
# -------------------------------------------------------------------------------------------------
41-
# Docker file paths for each version for base, mods, prod & work
42+
# Docker file paths for each version for base, mods, prod, slim & work
4243
# -------------------------------------------------------------------------------------------------
4344
template_dockerfiles:
4445
- src: DOCKERFILES/Dockerfile-base.j2
@@ -47,6 +48,8 @@ template_dockerfiles:
4748
dst: "../Dockerfiles/mods/Dockerfile-{{ php_version }}"
4849
- src: DOCKERFILES/Dockerfile-prod.j2
4950
dst: "../Dockerfiles/prod/Dockerfile-{{ php_version }}"
51+
- src: DOCKERFILES/Dockerfile-slim.j2
52+
dst: "../Dockerfiles/slim/Dockerfile-{{ php_version }}"
5053
- src: DOCKERFILES/Dockerfile-work.j2
5154
dst: "../Dockerfiles/work/Dockerfile-{{ php_version }}"
5255

@@ -55,25 +58,27 @@ template_dockerfiles:
5558
# Assign php.ini & php-fpm.conf to PHP versions
5659
# -------------------------------------------------------------------------------------------------
5760
template_configurations:
61+
5862
# php.ini
5963
- src: CONFIGURATIONS/php.ini.j2
6064
dst: "../Dockerfiles/base/data/php-ini.d/php-{{ php_version }}.ini"
6165
cfg: "{{ php_settings_ini }}"
6266
key: base
6367
alt: base
6468
- src: CONFIGURATIONS/php.ini.j2
65-
dst: "../Dockerfiles/work/data/php-ini.d/php-{{ php_version }}.ini"
69+
dst: "../Dockerfiles/slim/data/php-ini.d/php-{{ php_version }}.ini"
6670
cfg: "{{ php_settings_ini }}"
67-
key: work
68-
alt: base # Alternative key to use when definition is not set in 'work'
71+
key: slim
72+
alt: base # Alternative key to use when definition is not set in 'slim'
73+
6974
# php-fpm.conf
7075
- src: CONFIGURATIONS/php-fpm.conf.j2
7176
dst: "../Dockerfiles/base/data/php-fpm.conf/php-fpm-{{ php_version }}.conf"
7277
cfg: "{{ php_settings_fpm }}"
7378
key: base
7479
alt: base
7580
- src: CONFIGURATIONS/php-fpm.conf.j2
76-
dst: "../Dockerfiles/work/data/php-fpm.conf/php-fpm-{{ php_version }}.conf"
81+
dst: "../Dockerfiles/slim/data/php-fpm.conf/php-fpm-{{ php_version }}.conf"
7782
cfg: "{{ php_settings_fpm }}"
78-
key: work
79-
alt: base
83+
key: slim
84+
alt: base # Alternative key to use when definition is not set in 'slim'

.ansible/group_vars/all/all-php-settings.yml

+6-2
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ php_settings_ini:
5454
# ---- Inherits from base ----
5555
prod:
5656
# ---- Inherits from base and overwrites certain values ----
57-
work:
57+
slim:
5858
# Error reporting
5959
error_reporting: E_ALL | E_NOTICE | E_STRICT | E_DEPRECATED
6060
xmlrpc_errors: 'Off'
@@ -73,6 +73,8 @@ php_settings_ini:
7373
xdebug3_mode: 'Off'
7474
xdebug3_start_with_request: 'default'
7575
xdebug3_client_port: '9000'
76+
# ---- Inherits from slim ----
77+
work:
7678

7779
# -------------------------------------------------------------------------------------------------
7880
# php-fpm.conf
@@ -109,5 +111,7 @@ php_settings_fpm:
109111
mods:
110112
# ---- Inherits from base ----
111113
prod:
112-
# ---- Inherits from base and overwrites certain values ----
114+
# ---- Inherits from base ----
115+
slim:
116+
# ---- Inherits from base ----
113117
work:

0 commit comments

Comments
 (0)