From 5784422f40c1500ad91d43d8262c7e7a44661d53 Mon Sep 17 00:00:00 2001 From: gid9798 <30450294+gid9798@users.noreply.github.com> Date: Tue, 25 Jun 2019 03:34:07 +0300 Subject: [PATCH 1/5] add port an timezone --- 2.5/Dockerfile | 4 +++- 2.5/conf/z-ocsinventory-server.conf | 2 +- 2.5/dbconfig.inc.php | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/2.5/Dockerfile b/2.5/Dockerfile index 7e7e309..af13f7a 100644 --- a/2.5/Dockerfile +++ b/2.5/Dockerfile @@ -54,12 +54,14 @@ RUN apt-get update ; \ /usr/sbin/a2enmod authz_user ;\ wget https://raw.githubusercontent.com/OCSInventory-NG/OCSInventory-Server/master/binutils/docker-download.sh ;\ sh docker-download.sh 2.5 + +ENV TZ "Europe/Paris" WORKDIR /tmp/ocs/Apache RUN perl Makefile.PL ;\ make ;\ make install ;\ - cp /usr/share/zoneinfo/Europe/Paris /etc/localtime ;\ + ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone ;\ cp -R blib/lib/Apache /usr/local/share/perl/5.28.0/ ;\ cp -R Ocsinventory /usr/local/share/perl/5.28.0/ ;\ cp /tmp/ocs/etc/logrotate.d/ocsinventory-server /etc/logrotate.d/ ;\ diff --git a/2.5/conf/z-ocsinventory-server.conf b/2.5/conf/z-ocsinventory-server.conf index 6753b18..0cae3ee 100644 --- a/2.5/conf/z-ocsinventory-server.conf +++ b/2.5/conf/z-ocsinventory-server.conf @@ -21,7 +21,7 @@ # Replace localhost by hostname or ip of MySQL server for WRITE PerlSetEnv OCS_DB_HOST ${OCS_DBSERVER_WRITE} # Replace 3306 by port where running MySQL server, generally 3306 - PerlSetEnv OCS_DB_PORT 3306 + PerlSetEnv OCS_DB_PORT ${OCS_DBSERVER_WRITE_PORT} # Name of database PerlSetEnv OCS_DB_NAME ${OCS_DBNAME} PerlSetEnv OCS_DB_LOCAL ${OCS_DBNAME} diff --git a/2.5/dbconfig.inc.php b/2.5/dbconfig.inc.php index a0eb888..7b4b9f0 100644 --- a/2.5/dbconfig.inc.php +++ b/2.5/dbconfig.inc.php @@ -1,7 +1,7 @@ Date: Tue, 25 Jun 2019 14:22:17 +0300 Subject: [PATCH 2/5] change readme and dockerfile --- 2.5/Dockerfile | 2 ++ README.md | 8 ++++++++ 2 files changed, 10 insertions(+) diff --git a/2.5/Dockerfile b/2.5/Dockerfile index af13f7a..137c191 100644 --- a/2.5/Dockerfile +++ b/2.5/Dockerfile @@ -76,6 +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"} WORKDIR /tmp/ocs diff --git a/README.md b/README.md index 4a168e5..37f4bdb 100644 --- a/README.md +++ b/README.md @@ -49,6 +49,8 @@ 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 \ @@ -74,6 +76,8 @@ 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_WRITE_PORT=*(Database Server Port)* OCS_DBUSER= *(User database)* OCS_DBPASS= *(User password)* ``` @@ -118,6 +122,8 @@ 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 \ @@ -148,6 +154,8 @@ 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 \ From 7c56d94dd409451cef242509914139de3f64a039 Mon Sep 17 00:00:00 2001 From: gid9798 <30450294+gid9798@users.noreply.github.com> Date: Tue, 25 Jun 2019 15:00:34 +0300 Subject: [PATCH 3/5] dockerfile --- 2.5/Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/2.5/Dockerfile b/2.5/Dockerfile index 137c191..b8917b6 100644 --- a/2.5/Dockerfile +++ b/2.5/Dockerfile @@ -5,6 +5,8 @@ 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 From a8f63ce5398bbeca97e9b1702acb7f531b48467c Mon Sep 17 00:00:00 2001 From: gid9798 <30450294+gid9798@users.noreply.github.com> Date: Tue, 25 Jun 2019 15:17:25 +0300 Subject: [PATCH 4/5] dockerfile --- 2.5/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/2.5/Dockerfile b/2.5/Dockerfile index b8917b6..eb7f1dd 100644 --- a/2.5/Dockerfile +++ b/2.5/Dockerfile @@ -78,8 +78,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=${OCS_DBSERVER_READ_PORT:-"3306"} +ENV OCS_DBSERVER_WRITE_PORT=${OCS_DBSERVER_WRITE_PORT:-"3306"} WORKDIR /tmp/ocs 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 5/5] 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 \