Merge pull request #789 from winfried-van-loon/php-fpm-cleanup
Fixing whitespaces and tailing spaces
This commit is contained in:
		| @@ -82,6 +82,7 @@ services: | ||||
|         - backend | ||||
|  | ||||
| ### PHP Worker Container ##################################### | ||||
|  | ||||
|     php-worker: | ||||
|       build: | ||||
|         context: ./php-worker | ||||
|   | ||||
| @@ -44,7 +44,7 @@ ARG INSTALL_SOAP=false | ||||
| RUN if [ ${INSTALL_SOAP} = true ]; then \ | ||||
|     # Install the soap extension | ||||
|     apt-get -y update && \ | ||||
|     apt-get -y install libxml2-dev php-soap && \  | ||||
|     apt-get -y install libxml2-dev php-soap && \ | ||||
|     docker-php-ext-install soap \ | ||||
| ;fi | ||||
|  | ||||
| @@ -170,7 +170,7 @@ RUN if [ ${INSTALL_MYSQLI} = true ]; then \ | ||||
|  | ||||
| ARG INSTALL_TOKENIZER=false | ||||
| RUN if [ ${INSTALL_TOKENIZER} = true ]; then \ | ||||
|      docker-php-ext-install tokenizer \ | ||||
|     docker-php-ext-install tokenizer \ | ||||
| ;fi | ||||
|  | ||||
| # | ||||
|   | ||||
| @@ -34,7 +34,6 @@ MAINTAINER Mahmoud Zalt <mahmoud@zalt.me> | ||||
| # in the `docker-compose.yml` before the build. | ||||
| # Example: | ||||
| #   - INSTALL_ZIP_ARCHIVE=true | ||||
| #   - ... | ||||
| # | ||||
|  | ||||
| ##################################### | ||||
| @@ -138,7 +137,6 @@ RUN if [ ${INSTALL_EXIF} = true ]; then \ | ||||
|     docker-php-ext-install exif \ | ||||
| ;fi | ||||
|  | ||||
|  | ||||
| ##################################### | ||||
| # PHP Aerospike: | ||||
| ##################################### | ||||
| @@ -165,6 +163,7 @@ RUN if [ ${INSTALL_AEROSPIKE_EXTENSION} = true ]; then \ | ||||
| ##################################### | ||||
| # Opcache: | ||||
| ##################################### | ||||
|  | ||||
| ARG INSTALL_OPCACHE=false | ||||
| RUN if [ ${INSTALL_OPCACHE} = true ]; then \ | ||||
|     docker-php-ext-install opcache \ | ||||
| @@ -176,6 +175,7 @@ COPY ./opcache.ini /usr/local/etc/php/conf.d/opcache.ini | ||||
| ##################################### | ||||
| # Mysqli Modifications: | ||||
| ##################################### | ||||
|  | ||||
| ARG INSTALL_MYSQLI=false | ||||
| RUN if [ ${INSTALL_MYSQLI} = true ]; then \ | ||||
|     docker-php-ext-install mysqli \ | ||||
| @@ -187,12 +187,13 @@ RUN if [ ${INSTALL_MYSQLI} = true ]; then \ | ||||
|  | ||||
| ARG INSTALL_TOKENIZER=false | ||||
| RUN if [ ${INSTALL_TOKENIZER} = true ]; then \ | ||||
|      docker-php-ext-install tokenizer \ | ||||
|     docker-php-ext-install tokenizer \ | ||||
| ;fi | ||||
|  | ||||
| ##################################### | ||||
| # SQL SERVER: | ||||
| ##################################### | ||||
|  | ||||
| ARG MSSQL=false | ||||
| RUN if [ ${MSSQL} = true ]; then \ | ||||
|  | ||||
| @@ -243,7 +244,6 @@ RUN if [ ${MSSQL} = true ]; then \ | ||||
|         && ls -l /opt/microsoft/msodbcsql/ \ | ||||
|         && odbcinst -q -d -n "ODBC Driver 13 for SQL Server" && \ | ||||
|  | ||||
|  | ||||
|     ##################################### | ||||
|     # Install sqlsrv y pdo_sqlsrv | ||||
|     # extensions: | ||||
| @@ -261,8 +261,6 @@ RUN if [ ${MSSQL} = true ]; then \ | ||||
|     && locale-gen \ | ||||
| ;fi | ||||
|  | ||||
|  | ||||
|  | ||||
| ##################################### | ||||
| # Human Language and Character Encoding Support: | ||||
| ##################################### | ||||
|   | ||||
| @@ -34,7 +34,6 @@ MAINTAINER Mahmoud Zalt <mahmoud@zalt.me> | ||||
| # in the `docker-compose.yml` before the build. | ||||
| # Example: | ||||
| #   - INSTALL_ZIP_ARCHIVE=true | ||||
| #   - ... | ||||
| # | ||||
|  | ||||
| ##################################### | ||||
| @@ -164,6 +163,7 @@ RUN if [ ${INSTALL_AEROSPIKE_EXTENSION} = true ]; then \ | ||||
| ##################################### | ||||
| # Opcache: | ||||
| ##################################### | ||||
|  | ||||
| ARG INSTALL_OPCACHE=false | ||||
| RUN if [ ${INSTALL_OPCACHE} = true ]; then \ | ||||
|     docker-php-ext-install opcache \ | ||||
| @@ -175,6 +175,7 @@ COPY ./opcache.ini /usr/local/etc/php/conf.d/opcache.ini | ||||
| ##################################### | ||||
| # Mysqli Modifications: | ||||
| ##################################### | ||||
|  | ||||
| ARG INSTALL_MYSQLI=false | ||||
| RUN if [ ${INSTALL_MYSQLI} = true ]; then \ | ||||
|     docker-php-ext-install mysqli \ | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 Mike Erickson
					Mike Erickson