Skip to content

Commit ded68e0

Browse files
mblaschkemblaschke
committed
Fix php issues
1 parent d2d2fa8 commit ded68e0

File tree

75 files changed

+334
-62
lines changed

Some content is hidden

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

75 files changed

+334
-62
lines changed

‎conf/console.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ dockerTest:
4545
':centos':
4646
OS_FAMILY: 'redhat'
4747
':alpine':
48-
PHP_MHASH: '0'
4948
PHP_REDIS: '0'
5049
':ubuntu-12.04':
5150
PHP_REDIS: '0'
@@ -61,6 +60,7 @@ dockerTest:
6160
'php[^:]*:[0-9]':
6261
OS_FAMILY: 'debian'
6362
OS_VERSION: '8'
63+
PHP_OFFICIAL: '1'
6464
'/liquibase':
6565
OS_FAMILY: 'alpine'
6666
OS_VERSION: '3'

‎docker/php-official/5.6/Dockerfile

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,59 @@ RUN /usr/local/bin/apt-install \
132132
imagemagick \
133133
graphicsmagick \
134134
ghostscript \
135+
# Libraries
136+
libldap-2.4-2 \
137+
libxslt1.1 \
138+
zlib1g \
139+
libpng12-0 \
140+
libmcrypt4 \
141+
# Dev and headers
142+
libbz2-dev \
143+
libldap2-dev \
144+
libldb-dev \
145+
libmcrypt-dev \
146+
libxml2-dev \
147+
libxslt1-dev \
148+
zlib1g-dev \
149+
libpng12-dev \
150+
# Install extensions
151+
&& docker-php-ext-install \
152+
bcmath \
153+
bz2 \
154+
calendar \
155+
exif \
156+
gettext \
157+
mysqli \
158+
mcrypt \
159+
hash \
160+
pcntl \
161+
pdo_mysql \
162+
soap \
163+
sockets \
164+
tokenizer \
165+
sysvmsg \
166+
sysvsem \
167+
sysvshm \
168+
shmop \
169+
xsl \
170+
zip \
171+
gd \
172+
gettext \
173+
opcache \
174+
# Uninstall dev and header packages
175+
&& apt-get purge -y -f --force-yes \
176+
libbz2-dev \
177+
libldap2-dev \
178+
libldb-dev \
179+
libmcrypt-dev \
180+
libxml2-dev \
181+
libxslt1-dev \
182+
zlib1g-dev \
183+
libpng12-dev \
184+
# Install extensions for PHP 5.x
185+
&& pecl install apcu-4.0.11 redis \
186+
&& echo extension=apcu.so > /usr/local/etc/php/conf.d/apcu.ini \
187+
&& echo extension=redis.so > /usr/local/etc/php/conf.d/redis.ini \
135188
&& curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \
136189
&& /opt/docker/bin/provision run --tag bootstrap --role webdevops-php \
137190
&& /opt/docker/bin/bootstrap.sh \

‎docker/php-official/5.6/Dockerfile.jinja2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
{{ baseapp.debian() }}
2020

21-
{{ php.official() }}
21+
{{ php.official(version='5.6') }}
2222

2323
{{ docker.expose('9000') }}
2424
{{ docker.entrypoint("/opt/docker/bin/entrypoint.sh") }}

‎docker/php-official/5.6/conf/etc/php/php.webdevops.ini

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
; this file will overwrite default php.ini settings
66

77
display_errors = 0
8+
log_errors = 1
89

910
short_open_tag = Off
1011
variables_order = 'GPCS'

‎docker/php-official/5.6/conf/provision/roles/webdevops-php/tasks/bootstrap/init.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
- name: Set php main file (official)
1818
set_fact:
1919
php_etc_dir: /usr/local/etc/php
20-
php_main_conf: /usr/local/etc/php-fpm.conf
20+
php_main_conf: /usr/local/etc/php-fpm.d/zz-docker.conf
2121
php_pool_conf: www.conf
2222
php_pool_dir: /usr/local/etc/php-fpm.d
2323
php_fpm_bin: /usr/local/sbin/php-fpm

‎docker/php-official/5.6/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
dest: '/opt/docker/etc/php/fpm/php-fpm.conf'
3434
regexp: '^[\s;]*{{ item.key }}[\s]*='
3535
line: '{{ item.key }} = {{ item.value }}'
36+
insertafter: '\[global\]'
3637
with_items:
3738
- { key: 'error_log', value: "/docker.stderr" }
3839
- { key: 'pid', value: "/var/run/php-fpm.pid" }

‎docker/php-official/5.6/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
regexp: '^[\s;]*{{ item.key }}[\s]*='
4444
line: '{{ item.key }} = {{ item.value }}'
4545
with_items:
46-
- { key: 'listen', value: "0.0.0.0:9000" }
46+
- { key: 'listen', value: "[::]:9000" }
4747
- { key: 'catch_workers_output', value: "yes" }
4848
- { key: 'access.format', value: '[php-fpm:access] %R - %u %t "%m %r%Q%q" %s %f %{mili}d %{kilo}M %C%%' }
4949
- { key: 'access.log', value: "/docker.stdout" }

‎docker/php-official/7.0/Dockerfile

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,59 @@ RUN /usr/local/bin/apt-install \
133133
imagemagick \
134134
graphicsmagick \
135135
ghostscript \
136+
# Libraries
137+
libldap-2.4-2 \
138+
libxslt1.1 \
139+
zlib1g \
140+
libpng12-0 \
141+
libmcrypt4 \
142+
# Dev and headers
143+
libbz2-dev \
144+
libldap2-dev \
145+
libldb-dev \
146+
libmcrypt-dev \
147+
libxml2-dev \
148+
libxslt1-dev \
149+
zlib1g-dev \
150+
libpng12-dev \
151+
# Install extensions
152+
&& docker-php-ext-install \
153+
bcmath \
154+
bz2 \
155+
calendar \
156+
exif \
157+
gettext \
158+
mysqli \
159+
mcrypt \
160+
hash \
161+
pcntl \
162+
pdo_mysql \
163+
soap \
164+
sockets \
165+
tokenizer \
166+
sysvmsg \
167+
sysvsem \
168+
sysvshm \
169+
shmop \
170+
xsl \
171+
zip \
172+
gd \
173+
gettext \
174+
opcache \
175+
# Uninstall dev and header packages
176+
&& apt-get purge -y -f --force-yes \
177+
libbz2-dev \
178+
libldap2-dev \
179+
libldb-dev \
180+
libmcrypt-dev \
181+
libxml2-dev \
182+
libxslt1-dev \
183+
zlib1g-dev \
184+
libpng12-dev \
185+
# Install extensions for PHP 7.x
186+
&& pecl install apcu redis \
187+
&& echo extension=apcu.so > /usr/local/etc/php/conf.d/apcu.ini \
188+
&& echo extension=redis.so > /usr/local/etc/php/conf.d/redis.ini \
136189
&& curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \
137190
&& /opt/docker/bin/provision run --tag bootstrap --role webdevops-php \
138191
&& /opt/docker/bin/bootstrap.sh \

‎docker/php-official/7.0/Dockerfile.jinja2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
{{ baseapp.debian() }}
2121

22-
{{ php.official() }}
22+
{{ php.official(version='7.0') }}
2323

2424
{{ docker.expose('9000') }}
2525
{{ docker.entrypoint("/opt/docker/bin/entrypoint.sh") }}

‎docker/php-official/7.0/conf/etc/php/php.webdevops.ini

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
; this file will overwrite default php.ini settings
66

77
display_errors = 0
8+
log_errors = 1
89

910
short_open_tag = Off
1011
variables_order = 'GPCS'

‎docker/php-official/7.0/conf/provision/roles/webdevops-php/tasks/bootstrap/init.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
- name: Set php main file (official)
1818
set_fact:
1919
php_etc_dir: /usr/local/etc/php
20-
php_main_conf: /usr/local/etc/php-fpm.conf
20+
php_main_conf: /usr/local/etc/php-fpm.d/zz-docker.conf
2121
php_pool_conf: www.conf
2222
php_pool_dir: /usr/local/etc/php-fpm.d
2323
php_fpm_bin: /usr/local/sbin/php-fpm

‎docker/php-official/7.0/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
dest: '/opt/docker/etc/php/fpm/php-fpm.conf'
3434
regexp: '^[\s;]*{{ item.key }}[\s]*='
3535
line: '{{ item.key }} = {{ item.value }}'
36+
insertafter: '\[global\]'
3637
with_items:
3738
- { key: 'error_log', value: "/docker.stderr" }
3839
- { key: 'pid', value: "/var/run/php-fpm.pid" }

‎docker/php-official/7.0/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
regexp: '^[\s;]*{{ item.key }}[\s]*='
4444
line: '{{ item.key }} = {{ item.value }}'
4545
with_items:
46-
- { key: 'listen', value: "0.0.0.0:9000" }
46+
- { key: 'listen', value: "[::]:9000" }
4747
- { key: 'catch_workers_output', value: "yes" }
4848
- { key: 'access.format', value: '[php-fpm:access] %R - %u %t "%m %r%Q%q" %s %f %{mili}d %{kilo}M %C%%' }
4949
- { key: 'access.log', value: "/docker.stdout" }

‎docker/php-official/7.1/Dockerfile

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,59 @@ RUN /usr/local/bin/apt-install \
132132
imagemagick \
133133
graphicsmagick \
134134
ghostscript \
135+
# Libraries
136+
libldap-2.4-2 \
137+
libxslt1.1 \
138+
zlib1g \
139+
libpng12-0 \
140+
libmcrypt4 \
141+
# Dev and headers
142+
libbz2-dev \
143+
libldap2-dev \
144+
libldb-dev \
145+
libmcrypt-dev \
146+
libxml2-dev \
147+
libxslt1-dev \
148+
zlib1g-dev \
149+
libpng12-dev \
150+
# Install extensions
151+
&& docker-php-ext-install \
152+
bcmath \
153+
bz2 \
154+
calendar \
155+
exif \
156+
gettext \
157+
mysqli \
158+
mcrypt \
159+
hash \
160+
pcntl \
161+
pdo_mysql \
162+
soap \
163+
sockets \
164+
tokenizer \
165+
sysvmsg \
166+
sysvsem \
167+
sysvshm \
168+
shmop \
169+
xsl \
170+
zip \
171+
gd \
172+
gettext \
173+
opcache \
174+
# Uninstall dev and header packages
175+
&& apt-get purge -y -f --force-yes \
176+
libbz2-dev \
177+
libldap2-dev \
178+
libldb-dev \
179+
libmcrypt-dev \
180+
libxml2-dev \
181+
libxslt1-dev \
182+
zlib1g-dev \
183+
libpng12-dev \
184+
# Install extensions for PHP 7.x
185+
&& pecl install apcu redis \
186+
&& echo extension=apcu.so > /usr/local/etc/php/conf.d/apcu.ini \
187+
&& echo extension=redis.so > /usr/local/etc/php/conf.d/redis.ini \
135188
&& curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \
136189
&& /opt/docker/bin/provision run --tag bootstrap --role webdevops-php \
137190
&& /opt/docker/bin/bootstrap.sh \

‎docker/php-official/7.1/Dockerfile.jinja2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
{{ baseapp.debian() }}
2020

21-
{{ php.official() }}
21+
{{ php.official(version='7.1') }}
2222

2323
{{ docker.expose('9000') }}
2424
{{ docker.entrypoint("/opt/docker/bin/entrypoint.sh") }}

‎docker/php-official/7.1/conf/etc/php/php.webdevops.ini

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
; this file will overwrite default php.ini settings
66

77
display_errors = 0
8+
log_errors = 1
89

910
short_open_tag = Off
1011
variables_order = 'GPCS'

‎docker/php-official/7.1/conf/provision/roles/webdevops-php/tasks/bootstrap/init.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
- name: Set php main file (official)
1818
set_fact:
1919
php_etc_dir: /usr/local/etc/php
20-
php_main_conf: /usr/local/etc/php-fpm.conf
20+
php_main_conf: /usr/local/etc/php-fpm.d/zz-docker.conf
2121
php_pool_conf: www.conf
2222
php_pool_dir: /usr/local/etc/php-fpm.d
2323
php_fpm_bin: /usr/local/sbin/php-fpm

‎docker/php-official/7.1/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
dest: '/opt/docker/etc/php/fpm/php-fpm.conf'
3434
regexp: '^[\s;]*{{ item.key }}[\s]*='
3535
line: '{{ item.key }} = {{ item.value }}'
36+
insertafter: '\[global\]'
3637
with_items:
3738
- { key: 'error_log', value: "/docker.stderr" }
3839
- { key: 'pid', value: "/var/run/php-fpm.pid" }

‎docker/php-official/7.1/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
regexp: '^[\s;]*{{ item.key }}[\s]*='
4444
line: '{{ item.key }} = {{ item.value }}'
4545
with_items:
46-
- { key: 'listen', value: "0.0.0.0:9000" }
46+
- { key: 'listen', value: "[::]:9000" }
4747
- { key: 'catch_workers_output', value: "yes" }
4848
- { key: 'access.format', value: '[php-fpm:access] %R - %u %t "%m %r%Q%q" %s %f %{mili}d %{kilo}M %C%%' }
4949
- { key: 'access.log', value: "/docker.stdout" }

‎docker/php/alpine-3-php7/conf/etc/php/php.webdevops.ini

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
; this file will overwrite default php.ini settings
66

77
display_errors = 0
8+
log_errors = 1
89

910
short_open_tag = Off
1011
variables_order = 'GPCS'

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
dest: '/opt/docker/etc/php/fpm/php-fpm.conf'
3434
regexp: '^[\s;]*{{ item.key }}[\s]*='
3535
line: '{{ item.key }} = {{ item.value }}'
36+
insertafter: '\[global\]'
3637
with_items:
3738
- { key: 'error_log', value: "/docker.stderr" }
3839
- { key: 'pid', value: "/var/run/php-fpm.pid" }

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
regexp: '^[\s;]*{{ item.key }}[\s]*='
4444
line: '{{ item.key }} = {{ item.value }}'
4545
with_items:
46-
- { key: 'listen', value: "0.0.0.0:9000" }
46+
- { key: 'listen', value: "[::]:9000" }
4747
- { key: 'catch_workers_output', value: "yes" }
4848
- { key: 'access.format', value: '[php-fpm:access] %R - %u %t "%m %r%Q%q" %s %f %{mili}d %{kilo}M %C%%' }
4949
- { key: 'access.log', value: "/docker.stdout" }

‎docker/php/alpine-3/conf/etc/php/php.webdevops.ini

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
; this file will overwrite default php.ini settings
66

77
display_errors = 0
8+
log_errors = 1
89

910
short_open_tag = Off
1011
variables_order = 'GPCS'

‎docker/php/alpine-3/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
dest: '/opt/docker/etc/php/fpm/php-fpm.conf'
3434
regexp: '^[\s;]*{{ item.key }}[\s]*='
3535
line: '{{ item.key }} = {{ item.value }}'
36+
insertafter: '\[global\]'
3637
with_items:
3738
- { key: 'error_log', value: "/docker.stderr" }
3839
- { key: 'pid', value: "/var/run/php-fpm.pid" }

‎docker/php/alpine-3/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
regexp: '^[\s;]*{{ item.key }}[\s]*='
4444
line: '{{ item.key }} = {{ item.value }}'
4545
with_items:
46-
- { key: 'listen', value: "0.0.0.0:9000" }
46+
- { key: 'listen', value: "[::]:9000" }
4747
- { key: 'catch_workers_output', value: "yes" }
4848
- { key: 'access.format', value: '[php-fpm:access] %R - %u %t "%m %r%Q%q" %s %f %{mili}d %{kilo}M %C%%' }
4949
- { key: 'access.log', value: "/docker.stdout" }

‎docker/php/centos-7-php56/conf/etc/php/php.webdevops.ini

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
; this file will overwrite default php.ini settings
66

77
display_errors = 0
8+
log_errors = 1
89

910
short_open_tag = Off
1011
variables_order = 'GPCS'

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
dest: '/opt/docker/etc/php/fpm/php-fpm.conf'
3434
regexp: '^[\s;]*{{ item.key }}[\s]*='
3535
line: '{{ item.key }} = {{ item.value }}'
36+
insertafter: '\[global\]'
3637
with_items:
3738
- { key: 'error_log', value: "/docker.stderr" }
3839
- { key: 'pid', value: "/var/run/php-fpm.pid" }

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
regexp: '^[\s;]*{{ item.key }}[\s]*='
4444
line: '{{ item.key }} = {{ item.value }}'
4545
with_items:
46-
- { key: 'listen', value: "0.0.0.0:9000" }
46+
- { key: 'listen', value: "[::]:9000" }
4747
- { key: 'catch_workers_output', value: "yes" }
4848
- { key: 'access.format', value: '[php-fpm:access] %R - %u %t "%m %r%Q%q" %s %f %{mili}d %{kilo}M %C%%' }
4949
- { key: 'access.log', value: "/docker.stdout" }

0 commit comments

Comments
 (0)