diff --git a/2.6/Dockerfile b/2.6/Dockerfile index 9cd0e4c..3fb9dfc 100644 --- a/2.6/Dockerfile +++ b/2.6/Dockerfile @@ -57,6 +57,7 @@ RUN yum ${YUM_FLAGS} install wget \ php73-php-pecl-mcrypt \ php73-php-pecl-apcu \ php73-php-json \ + php73-php-soap \ php73-php-fpm \ php73-php-opcache ; diff --git a/2.6/docker-compose.yml b/2.6/example/docker-compose.yml similarity index 86% rename from 2.6/docker-compose.yml rename to 2.6/example/docker-compose.yml index 505d39e..3a557af 100644 --- a/2.6/docker-compose.yml +++ b/2.6/example/docker-compose.yml @@ -14,12 +14,17 @@ services: - "varlibdata:/var/lib/ocsinventory-reports" - "httpdconfdata:/etc/httpd/conf.d" environment: - OCS_DB_SERVER: ocsdb + OCS_DB_SERVER: ocsinventory-db OCS_DB_USER: ocsuser OCS_DB_PASS: ocspass OCS_DB_NAME: ocsweb links: - ocsdb + networks: + - localocs + depends_on: + - ocsdb + ocsdb : image : mysql:5.7 container_name : ocsinventory-db @@ -34,7 +39,12 @@ services: MYSQL_USER : ocsuser MYSQL_PASSWORD : ocspass MYSQL_DATABASE : ocsweb - + networks: + - localocs + +networks: + localocs: + volumes: perlcomdata: extensionsdata: diff --git a/2.6/scripts/docker-entrypoint.sh b/2.6/scripts/docker-entrypoint.sh index 1c0d72a..cd9d803 100755 --- a/2.6/scripts/docker-entrypoint.sh +++ b/2.6/scripts/docker-entrypoint.sh @@ -50,9 +50,9 @@ sed -i 's/PATH_TO_SNMP_DIR/'"${OCS_VARLIB_DIR//\//\\/}"'snmp/g' /etc/httpd/conf. # Generate dbconfig.inc.php cp /tmp/dbconfig.inc.php $OCS_WEBCONSOLE_DIR -sed -i 's/OCS_DB_NAME/'"$OCS_DB_SERVER"'/g' $OCS_WEBCONSOLE_DIR/dbconfig.inc.php -sed -i 's/OCS_READ_NAME/'"$OCS_DB_NAME"'/g' $OCS_WEBCONSOLE_DIR/dbconfig.inc.php -sed -i 's/OCS_WRITE_NAME/'"$OCS_DB_NAME"'/g' $OCS_WEBCONSOLE_DIR/dbconfig.inc.php +sed -i 's/OCS_DB_NAME/'"$OCS_DB_NAME"'/g' $OCS_WEBCONSOLE_DIR/dbconfig.inc.php +sed -i 's/OCS_READ_NAME/'"$OCS_DB_SERVER"'/g' $OCS_WEBCONSOLE_DIR/dbconfig.inc.php +sed -i 's/OCS_WRITE_NAME/'"$OCS_DB_SERVER"'/g' $OCS_WEBCONSOLE_DIR/dbconfig.inc.php sed -i 's/OCS_DB_USER/'"$OCS_DB_USER"'/g' $OCS_WEBCONSOLE_DIR/dbconfig.inc.php sed -i 's/OCS_DB_PASS/'"$OCS_DB_PASS"'/g' $OCS_WEBCONSOLE_DIR/dbconfig.inc.php diff --git a/nightly/Dockerfile b/nightly/Dockerfile index f4d77f6..0dd043e 100644 --- a/nightly/Dockerfile +++ b/nightly/Dockerfile @@ -58,6 +58,7 @@ RUN yum ${YUM_FLAGS} install wget \ php73-php-pecl-apcu \ php73-php-json \ php73-php-fpm \ + php73-php-soap \ php73-php-opcache ; COPY conf/* /tmp/ diff --git a/nightly/example/docker-compose.yml b/nightly/example/docker-compose.yml new file mode 100644 index 0000000..e045022 --- /dev/null +++ b/nightly/example/docker-compose.yml @@ -0,0 +1,54 @@ +version: '3' + +services: + ocsapplication: + image: ocsinventory/ocsinventory-docker-image:nightly + container_name : ocsinventory-server + restart: always + ports: + - 80:80 + - 443:443 + volumes: + - "perlcomdata:/etc/ocsinventory-server" + - "extensionsdata:/usr/share/ocsinventory-reports/ocsreports/extensions" + - "varlibdata:/var/lib/ocsinventory-reports" + - "httpdconfdata:/etc/httpd/conf.d" + environment: + OCS_DB_SERVER: ocsinventory-db + OCS_DB_USER: ocsuser + OCS_DB_PASS: ocspass + OCS_DB_NAME: ocsweb + links: + - ocsdb + networks: + - localocs + depends_on: + - ocsdb + + ocsdb : + image : mysql:5.7 + container_name : ocsinventory-db + restart: always + ports : + - 3306:3306 + volumes : + - ./sql/:/docker-entrypoint-initdb.d/ + - sqldata:/var/lib/mysql + environment: + MYSQL_ROOT_PASSWORD : rootpass + MYSQL_USER : ocsuser + MYSQL_PASSWORD : ocspass + MYSQL_DATABASE : ocsweb + networks: + - localocs + +networks: + localocs: + +volumes: + perlcomdata: + extensionsdata: + varlibdata: + httpdconfdata: + sqldata: + \ No newline at end of file