Skip to content

Commit 1edd360

Browse files
committed
Fixed typo. Removed trailing whitespace.
1 parent 93cf4f7 commit 1edd360

File tree

22 files changed

+55
-57
lines changed

22 files changed

+55
-57
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,4 +156,4 @@ docker build --tag=itkdev/php7.2-fpm .
156156
docker push itkdev/php7.2-fpm
157157
```
158158

159-
# !!!! Don't use iPhone hotspot. It wrecks everything, costs hours of debugging and ruins your day !!!!
159+
# !!!! Don't use iPhone hotspot. It wrecks everything, costs hours of debugging and ruins your day !!!!

drush6/Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
FROM itkdev/php7.0-fpm
32
MAINTAINER ITK dev <[email protected]>
43

@@ -19,4 +18,4 @@ RUN /root/.composer/vendor/bin/drush --version
1918

2019
ENV PATH="/root/.composer/vendor/bin/:${PATH}"
2120

22-
ENTRYPOINT ["drush"]
21+
ENTRYPOINT ["drush"]

mariadb/Dockerfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
FROM mariadb:10.3
32
MAINTAINER ITK dev <[email protected]>
43

mariadb/docker-itk-entrypoint.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@
44
/usr/local/bin/confd --onetime --backend env --confdir /etc/confd
55

66
## Run parent entry point.
7-
/usr/local/bin/docker-entrypoint.sh mysqld
7+
/usr/local/bin/docker-entrypoint.sh mysqld

perl5-fcgi/Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ RUN DEBIAN_FRONTEND=noninteractive \
1717
apt-get install -y \
1818
libfcgi-perl \
1919
perl \
20-
fcgiwrap \
20+
fcgiwrap \
2121
wget \
2222
build-essential \
2323
autoconf \
@@ -43,7 +43,7 @@ RUN PERL_MM_USE_DEFAULT=1 \
4343
Email::Simple \
4444
Email::Simple::Creator \
4545
Encode \
46-
Exporter \
46+
Exporter \
4747
File::Basename \
4848
File::Path \
4949
File::Temp \
@@ -71,7 +71,7 @@ RUN PERL_MM_USE_DEFAULT=1 \
7171
XML::LibXML \
7272
XML::LibXML::XPathContext \
7373
XML::Simple \
74-
DBD::mysql
74+
DBD::mysql
7575

7676
# Add mhsendmail for mailhog
7777
ADD https://github.com/mailhog/mhsendmail/releases/download/v0.2.0/mhsendmail_linux_amd64 /usr/local/bin/mhsendmail
@@ -88,4 +88,4 @@ WORKDIR /app
8888

8989
COPY docker-entrypoint.sh /usr/local/bin/
9090
RUN chmod +x /usr/local/bin/docker-entrypoint.sh
91-
CMD [ "docker-entrypoint.sh" ]
91+
CMD [ "docker-entrypoint.sh" ]

perl5-fcgi/docker-entrypoint.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#!/bin/bash
2-
set -e
2+
set -e
33

44
## Run templates with configuration.
55
/usr/local/bin/confd --onetime --backend env --confdir /etc/confd
66

77
## Start the perl fcgi process.
8-
/usr/sbin/fcgiwrap -s tcp:0.0.0.0:9000 -f
8+
/usr/sbin/fcgiwrap -s tcp:0.0.0.0:9000 -f

php5.6-fpm/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,4 +76,4 @@ EXPOSE 9000
7676
WORKDIR /app
7777

7878
COPY docker-entrypoint.sh /usr/local/bin/
79-
CMD [ "docker-entrypoint.sh" ]
79+
CMD [ "docker-entrypoint.sh" ]

php5.6-fpm/docker-entrypoint.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
2-
set -e
2+
set -e
33

44
# Add docker host domain to hosts file
55
if [ ! -z "${DOCKER_HOST_DOMAIN}" ]; then
@@ -16,4 +16,4 @@ fi
1616

1717
## Start the php FPM process.
1818
echo "Starting PHP 5.6 FPM"
19-
php-fpm5.6 -F --pid /var/run/php/php-fpm5.6.pid -y /etc/php/5.6/fpm/php-fpm.conf
19+
php-fpm5.6 -F --pid /var/run/php/php-fpm5.6.pid -y /etc/php/5.6/fpm/php-fpm.conf

php5.6-fpm/etc/confd/templates/php.ini.tmpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -910,8 +910,8 @@ default_socket_timeout = 60
910910
;extension=php_pgsql.dll
911911
;extension=php_shmop.dll
912912

913-
; The MIBS data available in the PHP distribution must be installed.
914-
; See http://www.php.net/manual/en/snmp.installation.php
913+
; The MIBS data available in the PHP distribution must be installed.
914+
; See http://www.php.net/manual/en/snmp.installation.php
915915
;extension=php_snmp.dll
916916

917917
;extension=php_soap.dll

php5.6-fpm/etc/php/5.6/fpm/pool.d/www.conf

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ listen = 9000
4848

4949
; Set permissions for unix socket, if one is used. In Linux, read/write
5050
; permissions must be set in order to allow connections from a web server. Many
51-
; BSD-derived systems allow connections regardless of permissions.
51+
; BSD-derived systems allow connections regardless of permissions.
5252
; Default Values: user and group are set as the running user
5353
; mode is set to 0660
5454
listen.owner = www-data
@@ -59,7 +59,7 @@ listen.group = www-data
5959
; When set, listen.owner and listen.group are ignored
6060
;listen.acl_users =
6161
;listen.acl_groups =
62-
62+
6363
; List of addresses (IPv4/IPv6) of FastCGI clients which are allowed to connect.
6464
; Equivalent to the FCGI_WEB_SERVER_ADDRS environment variable in the original
6565
; PHP FCGI (5.2.2+). Makes sense only with a tcp listening socket. Each address
@@ -138,7 +138,7 @@ pm.max_spare_servers = 3
138138
; Note: Used only when pm is set to 'ondemand'
139139
; Default Value: 10s
140140
;pm.process_idle_timeout = 10s;
141-
141+
142142
; The number of requests each child process should execute before respawning.
143143
; This can be useful to work around memory leaks in 3rd party libraries. For
144144
; endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS.
@@ -191,7 +191,7 @@ pm.max_spare_servers = 3
191191
;
192192
; By default the status page only outputs short status. Passing 'full' in the
193193
; query string will also return status for each pool process.
194-
; Example:
194+
; Example:
195195
; http://www.foo.bar/status?full
196196
; http://www.foo.bar/status?json&full
197197
; http://www.foo.bar/status?html&full
@@ -241,9 +241,9 @@ pm.max_spare_servers = 3
241241
; Note: The value must start with a leading slash (/). The value can be
242242
; anything, but it may not be a good idea to use the .php extension or it
243243
; may conflict with a real PHP file.
244-
; Default Value: not set
244+
; Default Value: not set
245245
;pm.status_path = /status
246-
246+
247247
; The ping URI to call the monitoring page of FPM. If this value is not set, no
248248
; URI will be recognized as a ping page. This could be used to test from outside
249249
; that FPM is alive and responding, or to
@@ -304,7 +304,7 @@ pm.max_spare_servers = 3
304304
; - ....
305305
; %p: PID of the child that serviced the request
306306
; %P: PID of the parent of the child that serviced the request
307-
; %q: the query string
307+
; %q: the query string
308308
; %Q: the '?' character if query string exists
309309
; %r: the request URI (without the query string, see %q and %Q)
310310
; %R: remote IP address
@@ -319,50 +319,50 @@ pm.max_spare_servers = 3
319319
;
320320
; Default: "%R - %u %t \"%m %r\" %s"
321321
;access.format = "%R - %u %t \"%m %r%Q%q\" %s %f %{mili}d %{kilo}M %C%%"
322-
322+
323323
; The log file for slow requests
324324
; Default Value: not set
325325
; Note: slowlog is mandatory if request_slowlog_timeout is set
326326
;slowlog = log/$pool.log.slow
327-
327+
328328
; The timeout for serving a single request after which a PHP backtrace will be
329329
; dumped to the 'slowlog' file. A value of '0s' means 'off'.
330330
; Available units: s(econds)(default), m(inutes), h(ours), or d(ays)
331331
; Default Value: 0
332332
;request_slowlog_timeout = 0
333-
333+
334334
; The timeout for serving a single request after which the worker process will
335335
; be killed. This option should be used when the 'max_execution_time' ini option
336336
; does not stop script execution for some reason. A value of '0' means 'off'.
337337
; Available units: s(econds)(default), m(inutes), h(ours), or d(ays)
338338
; Default Value: 0
339339
;request_terminate_timeout = 0
340-
340+
341341
; Set open file descriptor rlimit.
342342
; Default Value: system defined value
343343
;rlimit_files = 1024
344-
344+
345345
; Set max core size rlimit.
346346
; Possible Values: 'unlimited' or an integer greater or equal to 0
347347
; Default Value: system defined value
348348
;rlimit_core = 0
349-
349+
350350
; Chroot to this directory at the start. This value must be defined as an
351351
; absolute path. When this value is not set, chroot is not used.
352352
; Note: you can prefix with '$prefix' to chroot to the pool prefix or one
353353
; of its subdirectories. If the pool prefix is not set, the global prefix
354354
; will be used instead.
355-
; Note: chrooting is a great security feature and should be used whenever
355+
; Note: chrooting is a great security feature and should be used whenever
356356
; possible. However, all PHP paths will be relative to the chroot
357357
; (error_log, sessions.save_path, ...).
358358
; Default Value: not set
359-
;chroot =
360-
359+
;chroot =
360+
361361
; Chdir to this directory at the start.
362362
; Note: relative path can be used.
363363
; Default Value: current directory or / when chroot
364364
;chdir = /var/www
365-
365+
366366
; Redirect worker stdout and stderr into main error log. If not set, stdout and
367367
; stderr will be redirected to /dev/null according to FastCGI specs.
368368
; Note: on highloaded environement, this can cause some delay in the page
@@ -386,7 +386,7 @@ catch_workers_output = yes
386386
; Note: set an empty value to allow all extensions.
387387
; Default Value: .php
388388
;security.limit_extensions = .php .php3 .php4 .php5
389-
389+
390390
; Pass environment variables like LD_LIBRARY_PATH. All $VARIABLEs are taken from
391391
; the current environment.
392392
; Default Value: clean env
@@ -400,7 +400,7 @@ catch_workers_output = yes
400400
; overwrite the values previously defined in the php.ini. The directives are the
401401
; same as the PHP SAPI:
402402
; php_value/php_flag - you can set classic ini defines which can
403-
; be overwritten from PHP call 'ini_set'.
403+
; be overwritten from PHP call 'ini_set'.
404404
; php_admin_value/php_admin_flag - these directives won't be overwritten by
405405
; PHP call 'ini_set'
406406
; For php_*flag, valid values are on, off, 1, 0, true, false, yes or no.
@@ -419,4 +419,4 @@ catch_workers_output = yes
419419
;php_flag[display_errors] = off
420420
php_admin_value[error_log] = /proc/self/fd/2
421421
;php_admin_flag[log_errors] = on
422-
;php_admin_value[memory_limit] = 32M
422+
;php_admin_value[memory_limit] = 32M

0 commit comments

Comments
 (0)