Andrey/OCSInventory-Docker-Image
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #17 from gid9798/TEST

Browse Source 
Add timzone and DB port
This commit is contained in:
Valentin Deville 2019-06-25 16:01:42 +02:00 committed by GitHub
commit cc59facefb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
2.5/Dockerfile
View File

@ -54,12 +54,14 @@ RUN apt-get update ; \
/usr/sbin/a2enmod authz_user ;\ /usr/sbin/a2enmod authz_user ;\
wget https://raw.githubusercontent.com/OCSInventory-NG/OCSInventory-Server/master/binutils/docker-download.sh ;\ wget https://raw.githubusercontent.com/OCSInventory-NG/OCSInventory-Server/master/binutils/docker-download.sh ;\
sh docker-download.sh 2.5 sh docker-download.sh 2.5
ENV TZ "Europe/Paris"
WORKDIR /tmp/ocs/Apache WORKDIR /tmp/ocs/Apache
RUN perl Makefile.PL ;\ RUN perl Makefile.PL ;\
make ;\ make ;\
make install ;\ 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 blib/lib/Apache /usr/local/share/perl/5.28.0/ ;\
cp -R Ocsinventory /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/ ;\ cp /tmp/ocs/etc/logrotate.d/ocsinventory-server /etc/logrotate.d/ ;\
@ -74,6 +76,8 @@ ENV APACHE_PID_FILE /var/run/apache2.pid
ENV APACHE_RUN_DIR /var/run/apache2f ENV APACHE_RUN_DIR /var/run/apache2f
ENV APACHE_LOCK_DIR /var/lock/apache2 ENV APACHE_LOCK_DIR /var/lock/apache2
ENV APACHE_LOG_DIR /var/log/apache2 ENV APACHE_LOG_DIR /var/log/apache2
ENV OCS_DBSERVER_READ_PORT 3306
ENV OCS_DBSERVER_WRITE_PORT 3306
WORKDIR /tmp/ocs WORKDIR /tmp/ocs

2
2.5/conf/z-ocsinventory-server.conf
View File

@ -21,7 +21,7 @@
# Replace localhost by hostname or ip of MySQL server for WRITE # Replace localhost by hostname or ip of MySQL server for WRITE
PerlSetEnv OCS_DB_HOST ${OCS_DBSERVER_WRITE} PerlSetEnv OCS_DB_HOST ${OCS_DBSERVER_WRITE}
# Replace 3306 by port where running MySQL server, generally 3306 # 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 # Name of database
PerlSetEnv OCS_DB_NAME ${OCS_DBNAME} PerlSetEnv OCS_DB_NAME ${OCS_DBNAME}
PerlSetEnv OCS_DB_LOCAL ${OCS_DBNAME} PerlSetEnv OCS_DB_LOCAL ${OCS_DBNAME}

4
2.5/dbconfig.inc.php
View File

@ -1,7 +1,7 @@
<?php <?php
define("DB_NAME", getenv('OCS_DBNAME')); define("DB_NAME", getenv('OCS_DBNAME'));
define("SERVER_READ", getenv('OCS_DBSERVER_READ')); define("SERVER_READ", getenv('OCS_DBSERVER_READ').':'.getenv('OCS_DBSERVER_READ_PORT'));
define("SERVER_WRITE", getenv('OCS_DBSERVER_WRITE')); define("SERVER_WRITE", getenv('OCS_DBSERVER_WRITE').':'.getenv('OCS_DBSERVER_WRITE_PORT'));
define("COMPTE_BASE", getenv('OCS_DBUSER')); define("COMPTE_BASE", getenv('OCS_DBUSER'));
define("PSWD_BASE", getenv('OCS_DBPASS')); define("PSWD_BASE", getenv('OCS_DBPASS'));
$_SESSION["PSWD_BASE"]=PSWD_BASE; $_SESSION["PSWD_BASE"]=PSWD_BASE;

3
README.md
View File

@ -74,8 +74,11 @@ Use the following environmental variables to connect your MySQL Server.
OCS_DBNAME= *(Name of your database)* OCS_DBNAME= *(Name of your database)*
OCS_DBSERVER_READ= *(Database Server)* OCS_DBSERVER_READ= *(Database Server)*
OCS_DBSERVER_WRITE=*(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_DBUSER= *(User database)*
OCS_DBPASS= *(User password)* OCS_DBPASS= *(User password)*
TZ= *(TIMEZONE)*
``` ```
---------- ----------