Skip to content

Commit 78e8dbf

Browse files
authored
Merge pull request #36 from aakb/feature/cleanup
Fixed typo. Removed trailing whitespace.
2 parents 9b7b195 + 1c72df9 commit 78e8dbf

File tree

23 files changed

+67
-57
lines changed

23 files changed

+67
-57
lines changed

.editorconfig

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# EditorConfig is awesome: https://EditorConfig.org
2+
3+
# top-most EditorConfig file
4+
root = true
5+
6+
[*]
7+
end_of_line = lf
8+
insert_final_newline = true
9+
trim_trailing_whitespace = true
10+
charset = utf-8
11+
indent_style = space
12+
indent_size = 2

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

0 commit comments

Comments
 (0)