Skip to content

Commit e775f40

Browse files
mblaschkemblaschke
committed
Fix php images
- Fix official php images - Cleanup dev images (remove tools, please use composer)
1 parent ded68e0 commit e775f40

File tree

256 files changed

+397
-1473
lines changed

Some content is hidden

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

256 files changed

+397
-1473
lines changed

‎docker/php-apache-dev/5.6/conf/provision/entrypoint.d/10-php-debugger.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ PHP_CONF_PATHS="
1515
/etc/php5/fpm/conf.d
1616
/etc/php/7.0/mods-available
1717
/etc/php/7.0/cli/conf.d
18-
/etc/php/7.0/fpm/conf.d"
18+
/etc/php/7.0/fpm/conf.d
19+
/usr/local/etc/php/conf.d/"
1920

2021
function phpModuleRemove() {
2122
if [ "$#" -ne 1 ]; then

‎docker/php-apache-dev/5.6/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
---
22

3-
- include: bootstrap/tools.yml
43
- include: bootstrap/php-fpm.yml
54
- include: bootstrap/php-module.yml
65
- include: bootstrap/php-module.opcache.yml

‎docker/php-apache-dev/5.6/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml

-23
This file was deleted.

‎docker/php-apache-dev/7.0/conf/provision/entrypoint.d/10-php-debugger.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ PHP_CONF_PATHS="
1515
/etc/php5/fpm/conf.d
1616
/etc/php/7.0/mods-available
1717
/etc/php/7.0/cli/conf.d
18-
/etc/php/7.0/fpm/conf.d"
18+
/etc/php/7.0/fpm/conf.d
19+
/usr/local/etc/php/conf.d/"
1920

2021
function phpModuleRemove() {
2122
if [ "$#" -ne 1 ]; then

‎docker/php-apache-dev/7.0/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
---
22

3-
- include: bootstrap/tools.yml
43
- include: bootstrap/php-fpm.yml
54
- include: bootstrap/php-module.yml
65
- include: bootstrap/php-module.opcache.yml

‎docker/php-apache-dev/7.0/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml

-23
This file was deleted.

‎docker/php-apache-dev/7.1/conf/provision/entrypoint.d/10-php-debugger.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ PHP_CONF_PATHS="
1515
/etc/php5/fpm/conf.d
1616
/etc/php/7.0/mods-available
1717
/etc/php/7.0/cli/conf.d
18-
/etc/php/7.0/fpm/conf.d"
18+
/etc/php/7.0/fpm/conf.d
19+
/usr/local/etc/php/conf.d/"
1920

2021
function phpModuleRemove() {
2122
if [ "$#" -ne 1 ]; then

‎docker/php-apache-dev/7.1/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
---
22

3-
- include: bootstrap/tools.yml
43
- include: bootstrap/php-fpm.yml
54
- include: bootstrap/php-module.yml
65
- include: bootstrap/php-module.opcache.yml

‎docker/php-apache-dev/7.1/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml

-23
This file was deleted.

‎docker/php-apache-dev/alpine-3-php7/conf/provision/entrypoint.d/10-php-debugger.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ PHP_CONF_PATHS="
1515
/etc/php5/fpm/conf.d
1616
/etc/php/7.0/mods-available
1717
/etc/php/7.0/cli/conf.d
18-
/etc/php/7.0/fpm/conf.d"
18+
/etc/php/7.0/fpm/conf.d
19+
/usr/local/etc/php/conf.d/"
1920

2021
function phpModuleRemove() {
2122
if [ "$#" -ne 1 ]; then

‎docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
---
22

3-
- include: bootstrap/tools.yml
43
- include: bootstrap/php-fpm.yml
54
- include: bootstrap/php-module.yml
65
- include: bootstrap/php-module.opcache.yml

‎docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml

-23
This file was deleted.

‎docker/php-apache-dev/alpine-3/conf/provision/entrypoint.d/10-php-debugger.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ PHP_CONF_PATHS="
1515
/etc/php5/fpm/conf.d
1616
/etc/php/7.0/mods-available
1717
/etc/php/7.0/cli/conf.d
18-
/etc/php/7.0/fpm/conf.d"
18+
/etc/php/7.0/fpm/conf.d
19+
/usr/local/etc/php/conf.d/"
1920

2021
function phpModuleRemove() {
2122
if [ "$#" -ne 1 ]; then

‎docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
---
22

3-
- include: bootstrap/tools.yml
43
- include: bootstrap/php-fpm.yml
54
- include: bootstrap/php-module.yml
65
- include: bootstrap/php-module.opcache.yml

‎docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml

-23
This file was deleted.

‎docker/php-apache-dev/centos-7-php56/conf/provision/entrypoint.d/10-php-debugger.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ PHP_CONF_PATHS="
1515
/etc/php5/fpm/conf.d
1616
/etc/php/7.0/mods-available
1717
/etc/php/7.0/cli/conf.d
18-
/etc/php/7.0/fpm/conf.d"
18+
/etc/php/7.0/fpm/conf.d
19+
/usr/local/etc/php/conf.d/"
1920

2021
function phpModuleRemove() {
2122
if [ "$#" -ne 1 ]; then

‎docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
---
22

3-
- include: bootstrap/tools.yml
43
- include: bootstrap/php-fpm.yml
54
- include: bootstrap/php-module.yml
65
- include: bootstrap/php-module.opcache.yml

‎docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml

-23
This file was deleted.

‎docker/php-apache-dev/centos-7-php7/conf/provision/entrypoint.d/10-php-debugger.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ PHP_CONF_PATHS="
1515
/etc/php5/fpm/conf.d
1616
/etc/php/7.0/mods-available
1717
/etc/php/7.0/cli/conf.d
18-
/etc/php/7.0/fpm/conf.d"
18+
/etc/php/7.0/fpm/conf.d
19+
/usr/local/etc/php/conf.d/"
1920

2021
function phpModuleRemove() {
2122
if [ "$#" -ne 1 ]; then

‎docker/php-apache-dev/centos-7-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
---
22

3-
- include: bootstrap/tools.yml
43
- include: bootstrap/php-fpm.yml
54
- include: bootstrap/php-module.yml
65
- include: bootstrap/php-module.opcache.yml

‎docker/php-apache-dev/centos-7-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml

-23
This file was deleted.

‎docker/php-apache-dev/centos-7/conf/provision/entrypoint.d/10-php-debugger.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ PHP_CONF_PATHS="
1515
/etc/php5/fpm/conf.d
1616
/etc/php/7.0/mods-available
1717
/etc/php/7.0/cli/conf.d
18-
/etc/php/7.0/fpm/conf.d"
18+
/etc/php/7.0/fpm/conf.d
19+
/usr/local/etc/php/conf.d/"
1920

2021
function phpModuleRemove() {
2122
if [ "$#" -ne 1 ]; then

‎docker/php-apache-dev/centos-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
---
22

3-
- include: bootstrap/tools.yml
43
- include: bootstrap/php-fpm.yml
54
- include: bootstrap/php-module.yml
65
- include: bootstrap/php-module.opcache.yml

‎docker/php-apache-dev/centos-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml

-23
This file was deleted.

‎docker/php-apache-dev/debian-7/conf/provision/entrypoint.d/10-php-debugger.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ PHP_CONF_PATHS="
1515
/etc/php5/fpm/conf.d
1616
/etc/php/7.0/mods-available
1717
/etc/php/7.0/cli/conf.d
18-
/etc/php/7.0/fpm/conf.d"
18+
/etc/php/7.0/fpm/conf.d
19+
/usr/local/etc/php/conf.d/"
1920

2021
function phpModuleRemove() {
2122
if [ "$#" -ne 1 ]; then

‎docker/php-apache-dev/debian-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
---
22

3-
- include: bootstrap/tools.yml
43
- include: bootstrap/php-fpm.yml
54
- include: bootstrap/php-module.yml
65
- include: bootstrap/php-module.opcache.yml

‎docker/php-apache-dev/debian-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml

-23
This file was deleted.

‎docker/php-apache-dev/debian-8-php7/conf/provision/entrypoint.d/10-php-debugger.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ PHP_CONF_PATHS="
1515
/etc/php5/fpm/conf.d
1616
/etc/php/7.0/mods-available
1717
/etc/php/7.0/cli/conf.d
18-
/etc/php/7.0/fpm/conf.d"
18+
/etc/php/7.0/fpm/conf.d
19+
/usr/local/etc/php/conf.d/"
1920

2021
function phpModuleRemove() {
2122
if [ "$#" -ne 1 ]; then

‎docker/php-apache-dev/debian-8-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
---
22

3-
- include: bootstrap/tools.yml
43
- include: bootstrap/php-fpm.yml
54
- include: bootstrap/php-module.yml
65
- include: bootstrap/php-module.opcache.yml

0 commit comments

Comments
 (0)