Merge pull request #17 from mgust/parameterised_user

* Parameterized user, host
* PHP config fixes

Author: pierrecdn

Dockerfile

@@ -47,11 +47,10 @@ RUN tar -xzf /tmp/v${PHPSAML_VERSION}.tar.gz -C ${WEB_REPO}/functions/php-saml/
 # Use system environment variables into config.php
 RUN cp ${WEB_REPO}/config.dist.php ${WEB_REPO}/config.php && \
     chown www-data /var/www/html/app/admin/import-export/upload && \
-    sed -i -e "s/\['host'\] = 'localhost'/\['host'\] = 'mysql'/" \
-    -e "s/\['user'\] = 'phpipam'/\['user'\] = 'root'/" \
-    -e "s/\['pass'\] = 'phpipamadmin'/\['pass'\] = getenv(\"MYSQL_ENV_MYSQL_ROOT_PASSWORD\")/" \
-    ${WEB_REPO}/config.php && \
-    sed -i -e "s/\['port'\] = 3306;/\['port'\] = 3306;\n\n\$password_file = getenv(\"MYSQL_ENV_MYSQL_ROOT_PASSWORD\");\nif(file_exists(\$password_file))\n\$db\['pass'\] = preg_replace(\"\/\\\\s+\/\", \"\", file_get_contents(\$password_file));/" \
+    sed -i -e "s/\['host'\] = 'localhost'/\['host'\] = getenv(\"MYSQL_ENV_MYSQL_HOST\") ?: \"mysql\"/" \
+    -e "s/\['user'\] = 'phpipam'/\['user'\] = getenv(\"MYSQL_ENV_MYSQL_USER\") ?: \"root\"/" \
+    -e "s/\['pass'\] = 'phpipamadmin'/\['pass'\] = getenv(\"MYSQL_ENV_MYSQL_PASSWORD\")/" \
+    -e "s/\['port'\] = 3306;/\['port'\] = 3306;\n\n\$password_file = getenv(\"MYSQL_ENV_MYSQL_PASSWORD_FILE\");\nif(file_exists(\$password_file))\n\$db\['pass'\] = preg_replace(\"\/\\\\s+\/\", \"\", file_get_contents(\$password_file));/" \
     ${WEB_REPO}/config.php
 
 EXPOSE 80

README.md

@@ -23,7 +23,7 @@ Here, we store data on the host system under `/my_dir/phpipam` and use a specifi
 ### Phpipam 
 
 ```bash
-$ docker run -ti -d -p 80:80 --name ipam --link phpipam-mysql:mysql pierrecdn/phpipam
+$ docker run -ti -d -p 80:80 -e MYSQL_ENV_MYSQL_PASSWORD=my-secret-pw--name ipam --link phpipam-mysql:mysql pierrecdn/phpipam
 ```
 
 We are linking the two containers and expose the HTTP port. 
@@ -76,7 +76,9 @@ services:
       - mysql
     image: pierrecdn/phpipam
     environment:
-      - MYSQL_ENV_MYSQL_ROOT_PASSWORD=my-secret-pw
+      - MYSQL_ENV_MYSQL_USER=root
+      - MYSQL_ENV_MYSQL_PASSWORD=my-secret-pw
+      - MYSQL_ENV_MYSQL_HOST=mysql
     ports:
       - "80:80"
 volumes:
@@ -89,7 +91,7 @@ And next :
 $ docker-compose up -d
 ```
 
-You can also point the `MYSQL_ENV_ROOT_PASSWORD` environment variable to a file,
+You can also point the `MYSQL_ENV_PASSWORD_FILE` environment variable to a file,
 in which case the contents of this file will be used as the password.
 This makes it possible to use docker secrets for instance:
 
@@ -99,7 +101,7 @@ version: '3'
 services:
   ipam:
     environment:
-      - MYSQL_EVN_MYSQL_ROOT_PASSWORD=/run/secrets/phpipam_mysql_root_password
+      - MYSQL_ENV_MYSQL_PASSWORD_FILE=/run/secrets/phpipam_mysql_root_password
     secrets:
       - phpipam_mysql_root_password
 ```

php.ini

@@ -7,11 +7,11 @@ zlib.output_compression = Off
 implicit_flush = Off
 serialize_precision = 17
 zend.enable_gc = On
-expose_php = On
+expose_php = Off
 max_execution_time = 30
 max_input_time = 60
 error_reporting = E_ALL & ~E_DEPRECATED & ~E_STRICT
-display_errors = On
+display_errors = Off
 log_errors = On
 log_errors_max_len = 1024
 default_mimetype = "text/html"
@@ -24,7 +24,7 @@ allow_url_include = Off
 default_socket_timeout = 60
 
 [Date]
-date.timezone = "US/Central"
+date.timezone = "UTC"
 
 [mail function]
 smtp_port = 25