diff --git a/Dockerfile b/Dockerfile index d072bd5..a2991b3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,13 +22,15 @@ ARG MANTISBT_VERSION=2.27.1 #--------------------------------------------------------------------------------------------------- ARG MANTISBT='#!/bin/bash \n\ \n\ -chown -R apache:apache /var/www/html' +chown -R apache:apache ${APACHE_DOC_ROOT} \n\ + \n\ +sed -i -e "s%mailhub=mail%mailhub=${SMTP_SERVER}%" /etc/ssmtp/ssmtp.conf' #--------------------------------------------------------------------------------------------------- RUN urpmi.update -a \ - && urpmi --force wget \ + && urpmi --force wget ssmtp php-xmlreader php-xmlwriter \ && wget -q -O - https://sourceforge.net/projects/mantisbt/files/mantis-stable/${MANTISBT_VERSION}/mantisbt-${MANTISBT_VERSION}.tar.gz/download | tar xzvf - -C /var/www/html \ && mv /var/www/html/mantisbt-${MANTISBT_VERSION} /var/www/html/mantisbt \ && chown -R root:root /var/www \ diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index 8d5bc85..bc7e3c8 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -1,3 +1,14 @@ +------------------------------------------------------------------------------------------------------------------------------------ +Rx3-Docker/MantisBT V 1.0.1 - A. GIBERT - 2025/03/07 +------------------------------------------------------------------------------------------------------------------------------------ + +- Add default config in etc/mantisbt/config_inc.php.ref, +- Add ssmtp program and env variable to allow mail sending, +- Add php xmlreader & xmlwriter module tu support "Import/Export issues" plugin, +- Switch to docker_tools "mixed" volume mode. + + + ------------------------------------------------------------------------------------------------------------------------------------ Rx3-Docker/MantisBT V 1.0.0 - A. GIBERT - 2025/03/06 ------------------------------------------------------------------------------------------------------------------------------------ diff --git a/compose.yaml b/compose.yaml index 5841907..8967673 100644 --- a/compose.yaml +++ b/compose.yaml @@ -49,9 +49,6 @@ services: image: ${WA_IMG_URL} - dns: - - 10.0.0.1 - build: context: . args: @@ -72,12 +69,19 @@ services: APACHE_UID: ${WA_USER_ID} APACHE_GID: ${WA_GROUP_ID} APACHE_DOC_ROOT: ${APACHE_DOC_ROOT} + + SMTP_SERVER: ${SMTP_SERVER} + WINDOW_TITLE: ${WINDOW_TITLE} + LOGO_IMG: ${LOGO_IMG} + APPL_URL: ${APPL_URL} volumes: - ./${WA_LOG_INIT_EXT}:${WA_LOG_INIT_INT} - ./${WA_LOG_SV_EXT}:${WA_LOG_SV_INT} - ./${WA_LOG_HTTPD_EXT}:${WA_LOG_HTTPD_INT} - - ./${WA_LOG_MAIN_EXT}:${WA_LOG_MAIN_INT} + + - ./${WA_CONF_EXT}:${WA_CONF_INT} +# - ./${WA_IMG_EXT}:${WA_IMG_INT} networks: - appl diff --git a/env.dist b/env.dist index 6df2bce..113d1f0 100644 --- a/env.dist +++ b/env.dist @@ -20,7 +20,7 @@ APPL_NAME="mantisbt" APPL_NAME_FULL="Mantis Bug Tracker" APPL_NAME_SHORT="mantisbt" APPL_ORG="rx3-docker" -APPL_VERSION="1.0.0" +APPL_VERSION="1.0.1" APPL_MAINTAINER='"Arnaud G. GIBERT" ' @@ -66,8 +66,8 @@ NETWORK_NAME=${HOST_NAME_PREFIX} NETWORK_IF_NAME=br-${APPL_NAME_SHORT}-${APPL_ENV} DOCKER_TOOLS_DEBUG=FALSE -#DOCKER_TOOLS_VOLUME=MIXED -DOCKER_TOOLS_VOLUME=MERGED +DOCKER_TOOLS_VOLUME=MIXED +#DOCKER_TOOLS_VOLUME=MERGED DOCKER_TOOLS_EXEPTION_LIBS="postgres:pgsql" @@ -79,7 +79,7 @@ DOCKER_TOOLS_EXEPTION_LIBS="postgres:pgsql" docker_service_add DB database ${ORG_URL_PREFIX} postgresql - 1.1.0-mga9 - - - postgres - - 5432 - - postgres postgres -docker_service_add WA webapp ${ORG_URL_PREFIX} mantisbt "Rx3-Docker/MantisBT" ${APPL_VERSION}-mga9 ${ORG_URL_PREFIX} php-apache 1.4.0-mga9 - - 8085 80 - - apache apache +docker_service_add WA webapp ${ORG_URL_PREFIX} mantisbt "Rx3-Docker/MantisBT" ${APPL_VERSION}-mga9 ${ORG_URL_PREFIX} php-apache 1.4.0-mga9 - - 8070 80 - - apache apache @@ -96,14 +96,6 @@ DB_SERVER_NAME="MantisBT" -#------------------------------------------------------------------------------- -# Tools -#------------------------------------------------------------------------------- - -TOOLS_RPC_ENABLED="FALSE" - - - #------------------------------------------------------------------------------- # WebApp #------------------------------------------------------------------------------- @@ -112,5 +104,26 @@ APACHE_DOC_ROOT=/var/www/html WA_CROND_ENABLED="FALSE" -WA_LOG_HTTPD_INT="/var/log/httpd" WA_LOG_HTTPD_EXT="./var/log/httpd-webapp" +WA_LOG_HTTPD_INT="/var/log/httpd" + +WA_CONF_EXT=./etc/${APPL_NAME} +WA_CONF_INT=${APACHE_DOC_ROOT}/${APPL_NAME}/config + +docker_config_add ${WA_CONF_EXT}/config_inc.php ${WA_CONF_EXT}/config_inc.php.ref + +SMTP_SERVER="mail.rx3.net" +WINDOW_TITLE="MantisBT - Arena-SI" +LOGO_IMG="images-local/arena-si.jpg" + +if [[ "${APPL_ENV}" != "prd" ]] +then + APPL_URL="http://localhost:${WA_PORT_MAIN_EXT}/${APPL_NAME}/" +else + APPL_URL="https://arena-si.fr/tools/${APPL_NAME}/" +fi + +WA_IMG_EXT=./var/www/html/${APPL_NAME}/images-local +WA_IMG_INT=${APACHE_DOC_ROOT}/${APPL_NAME}/images-local + + diff --git a/etc/mantisbt/config_inc.php.ref b/etc/mantisbt/config_inc.php.ref new file mode 100644 index 0000000..42bd59d --- /dev/null +++ b/etc/mantisbt/config_inc.php.ref @@ -0,0 +1,23 @@ +