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

add port an timezone

Browse Source
This commit is contained in:
gid9798 2019-06-25 03:34:07 +03:00
parent a6e3e350de
commit 5784422f40
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
2.5/Dockerfile
View File

@ -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/ ;\

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
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}

4
2.5/dbconfig.inc.php
View File

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