From a106894b812fcdeeedd0b59b51921d8be3ad4f25 Mon Sep 17 00:00:00 2001
From: gid9798 <30450294+gid9798@users.noreply.github.com>
Date: Tue, 25 Jun 2019 15:40:00 +0300
Subject: [PATCH] readme and docker

---
 2.5/Dockerfile | 6 ++----
 README.md      | 9 ++-------
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/2.5/Dockerfile b/2.5/Dockerfile
index eb7f1dd..1ad5d10 100644
--- a/2.5/Dockerfile
+++ b/2.5/Dockerfile
@@ -5,8 +5,6 @@ LABEL version="2.5"
 LABEL description="OCS (Open Computers and Software Inventory Next Generation)"
 
 ARG APT_FLAGS="-y --no-install-recommends"
-ARG OCS_DBSERVER_READ_PORT
-ARG OCS_DBSERVER_WRITE_PORT
 
 VOLUME /var/lib/mysql
 
@@ -78,8 +76,8 @@ ENV APACHE_PID_FILE     /var/run/apache2.pid
 ENV APACHE_RUN_DIR      /var/run/apache2f
 ENV APACHE_LOCK_DIR     /var/lock/apache2
 ENV APACHE_LOG_DIR      /var/log/apache2
-ENV OCS_DBSERVER_READ_PORT=${OCS_DBSERVER_READ_PORT:-"3306"}
-ENV OCS_DBSERVER_WRITE_PORT=${OCS_DBSERVER_WRITE_PORT:-"3306"}
+ENV OCS_DBSERVER_READ_PORT	3306
+ENV OCS_DBSERVER_WRITE_PORT	3306
 
 WORKDIR /tmp/ocs
 
diff --git a/README.md b/README.md
index 37f4bdb..6dcc3c6 100644
--- a/README.md
+++ b/README.md
@@ -49,8 +49,6 @@ sudo docker run \
 -e OCS_DBNAME=ocsweb \
 -e OCS_DBSERVER_READ=localhost \
 -e OCS_DBSERVER_WRITE=localhost \
--e OCS_DBSERVER_READ_PORT=3306 \
--e OCS_DBSERVER_WRITE_PORT=3306 \
 -e OCS_DBUSER=ocs \
 -e OCS_DBPASS=ocs \
 -itd \
@@ -76,10 +74,11 @@ Use the following environmental variables to connect your MySQL Server.
 OCS_DBNAME= *(Name of your database)*
 OCS_DBSERVER_READ= *(Database Server)*
 OCS_DBSERVER_WRITE=*(Database Server)*
-OCS_DBSERVER_READ_PORT=*(Database Server Port)*
+OCS_DBSERVER_READ_PORT=	*(Database Server Port)*
 OCS_DBSERVER_WRITE_PORT=*(Database Server Port)*
 OCS_DBUSER= *(User database)*
 OCS_DBPASS= *(User password)*
+TZ= *(TIMEZONE)*
 ```
 ----------
 
@@ -122,8 +121,6 @@ sudo docker run \
 -e OCS_DBNAME=ocsweb \
 -e OCS_DBSERVER_READ=localhost \
 -e OCS_DBSERVER_WRITE=localhost \
--e OCS_DBSERVER_READ_PORT=3306 \
--e OCS_DBSERVER_WRITE_PORT=3306 \
 -e OCS_DBUSER=ocs \
 -e OCS_DBPASS=ocs \
 -itd \
@@ -154,8 +151,6 @@ sudo docker run \
 -e OCS_DBNAME=ocsweb \
 -e OCS_DBSERVER_READ=localhost \
 -e OCS_DBSERVER_WRITE=localhost \
--e OCS_DBSERVER_READ_PORT=3306 \
--e OCS_DBSERVER_WRITE_PORT=3306 \
 -e OCS_DBUSER=ocs \
 -e OCS_DBPASS=ocs \
 -itd \