diff --git a/Dockerfile b/Dockerfile index 505dd8c..f8a7ffc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,22 +17,25 @@ LABEL maintainer=${IMG_MAINTAINER} ARG SQUASHTM_HOME=/opt/appl/squashtm ARG SQUASHTM_STARTUP=${SQUASHTM_HOME}/bin/startup.sh +ARG SQUASHTM_CONFIG=${SQUASHTM_HOME}/conf/squash.tm.cfg.properties -#---------------------------------------------------------------------------------------------------------------------------------------------- -ARG SQUASHTM='#!/bin/bash \n\ - \n\ -chown -R squashtm:squashtm '${SQUASHTM_HOME}' \n\ -chmod -R u-x,g-x,o-rwx,u+X,g+X '${SQUASHTM_HOME}' \n\ - \n\ -sed -i "s%^DB_TYPE=h2%DB_TYPE=postgresql%" '${SQUASHTM_STARTUP}' \n\ -sed -i "s%^DB_URL=\".*\"%DB_URL=\"jdbc:postgresql://${SQUASHTM_DB_HOST}:${SQUASHTM_DB_PORT}/${SQUASHTM_DB_NAME}\"%" '${SQUASHTM_STARTUP}' \n\ -sed -i "s%^DB_USERNAME=sa%DB_USERNAME=${SQUASHTM_DB_USER}%" '${SQUASHTM_STARTUP}' \n\ -sed -i "s%^DB_PASSWORD=sa%DB_PASSWORD=${SQUASHTM_DB_PASSWORD}%" '${SQUASHTM_STARTUP}' \n\ - \n\ -chmod a+x '${SQUASHTM_STARTUP} -#---------------------------------------------------------------------------------------------------------------------------------------------- +#------------------------------------------------------------------------------------------------------------------------------------------------- +ARG SQUASHTM='#!/bin/bash \n\ + \n\ +chown -R squashtm:squashtm '${SQUASHTM_HOME}' \n\ +chmod -R u-x,g-x,o-rwx,u+X,g+X '${SQUASHTM_HOME}' \n\ + \n\ +sed -i "s%^DB_TYPE=h2%DB_TYPE=postgresql%" '${SQUASHTM_STARTUP}' \n\ +sed -i "s%^DB_URL=\".*\"%DB_URL=\"jdbc:postgresql://${SQUASHTM_DB_HOST}:${SQUASHTM_DB_PORT}/${SQUASHTM_DB_NAME}\"%" '${SQUASHTM_STARTUP}' \n\ +sed -i "s%^DB_USERNAME=sa%DB_USERNAME=${SQUASHTM_DB_USER}%" '${SQUASHTM_STARTUP}' \n\ +sed -i "s%^DB_PASSWORD=sa%DB_PASSWORD=${SQUASHTM_DB_PASSWORD}%" '${SQUASHTM_STARTUP}' \n\ + \n\ +echo "server.servlet.context-path=${SQUASHTM_CONTEXT_PATH}" >> '${SQUASHTM_CONFIG}' \n\ + \n\ +chmod a+x '${SQUASHTM_STARTUP} +#------------------------------------------------------------------------------------------------------------------------------------------------- diff --git a/ReadMe.txt b/ReadMe.txt index afeb4c4..012f411 100644 --- a/ReadMe.txt +++ b/ReadMe.txt @@ -5,14 +5,9 @@ Welcome to Rx3-Docker/SquashTM docker image! This project aims to build a MantisBT docker image. Features: - - Curtently based on rx3-docker/java-1.1.1-mga9 & rx3-docker/postgresql:1.1.1-mga9 images, + - Curtently based on rx3-docker/java-1.1.1-mga9 & rx3-docker/postgresql:1.1.2-mga9 images, - Sync with SquashTM 9.0.0. -Note: -The following SQL have to been executed on mantisdb with postgres user: - GRANT ALL PRIVILEGES ON ALL TABLES IN SCHEMA public TO mantisbt; - GRANT ALL PRIVILEGES ON ALL SEQUENCES IN SCHEMA public TO mantisbt; - Enjoy it! diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index d55ed0b..b9662f4 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -1,21 +1,6 @@ ------------------------------------------------------------------------------------------------------------------------------------ -Rx3-Docker/MantisBT V 1.0.1 - A. GIBERT - 2025/03/08 ------------------------------------------------------------------------------------------------------------------------------------- - -- Add default config in etc/mantisbt/config_inc.php.ref, -- Add MANTISBT_ADMIN_ENABLED env variable to disable admin directory access, -- Add var/www/mantisbt/images-local volume allowing logo addition, -- Add ssmtp program and SMTP_SERVER env variable to allow mail sending, -- Add php xmlreader & xmlwriter module tu support "Import/Export issues" plugin, -- Switch to docker_tools "mixed" volume mode, -- Now use rx3-docker/php-apache:1.5.2-mga9 & rx3-docker/postgresql:1.1.1-mga9 images, -- Set PHP_UPLOAD_LIMIT to 64M. - - - ------------------------------------------------------------------------------------------------------------------------------------- -Rx3-Docker/MantisBT V 1.0.0 - A. GIBERT - 2025/03/06 +Rx3-Docker/SquashTM V 1.0.0 - A. GIBERT - 2025/03/13 ------------------------------------------------------------------------------------------------------------------------------------ - Initial release, -- Use based on rx3-docker/php-apache:1.4.0-mga9 & rx3-docker/postgresql:1.1.0-mga9 images. +- Use based on rx3-docker/java:1.1.1-mga9 & rx3-docker/postgresql:1.1.2-mga9 images. diff --git a/compose.yaml b/compose.yaml index 908b98e..f08a4b8 100644 --- a/compose.yaml +++ b/compose.yaml @@ -67,16 +67,13 @@ services: environment: SERVER_CROND_ENABLED: ${WA_CROND_ENABLED} - APACHE_UID: ${WA_USER_ID} - APACHE_GID: ${WA_GROUP_ID} - APACHE_DOC_ROOT: ${WA_APACHE_DOC_ROOT} - PHP_UPLOAD_LIMIT: ${WA_PHP_UPLOAD_LIMIT} SQUASHTM_DB_NAME: ${DB_NAME} SQUASHTM_DB_USER: ${DB_USER} SQUASHTM_DB_PASSWORD: ${DB_PASSWORD} SQUASHTM_DB_HOST: ${DB_HOST_NAME} SQUASHTM_DB_PORT: ${DB_PORT_MAIN_INT} + SQUASHTM_CONTEXT_PATH: ${WA_CONTEXT_PATH} volumes: - ./${WA_LOG_INIT_EXT}:${WA_LOG_INIT_INT} diff --git a/env.dist b/env.dist index c820888..ee2adc6 100644 --- a/env.dist +++ b/env.dist @@ -102,34 +102,7 @@ DB_SERVER_NAME="Squash TM" WA_CROND_ENABLED="FALSE" -WA_APACHE_DOC_ROOT="/var/www/html" -WA_PHP_UPLOAD_LIMIT="64M" - -WA_LOG_HTTPD_EXT="./var/log/httpd-webapp" -WA_LOG_HTTPD_INT="/var/log/httpd" - -WA_CONF_EXT=./etc/${APPL_NAME} -WA_CONF_INT=${WA_APACHE_DOC_ROOT}/${APPL_NAME}/config -# -#docker_config_add ${WA_CONF_EXT}/config_inc.php ${WA_CONF_EXT}/config_inc.php.ref -# -#WA_SMTP_SERVER="mail.rx3.net" -#WA_WINDOW_TITLE="MantisBT - Arena-SI" -#WA_LOGO_IMG="images-local/arena-si.jpg" -# -#if [[ "${APPL_ENV}" != "prd" ]] -#then -# WA_APPL_URL="http://localhost:${WA_PORT_MAIN_EXT}/${APPL_NAME}/" -#else -# WA_APPL_URL="https://private.arena-si.fr/tools/${APPL_NAME}/" -#fi - -WA_MANTISBT_ADMIN_ENABLED="TRUE" -#WA_MANTISBT_ADMIN_ENABLED="FALSE" - -WA_IMG_EXT=./var/www/html/${APPL_NAME}/images-local -WA_IMG_INT=${WA_APACHE_DOC_ROOT}/${APPL_NAME}/images-local - +WA_CONTEXT_PATH="/tools/squashtm" WA_LOG_MAIN_EXT=./var/log/squashtm WA_LOG_MAIN_INT=/var/log/squashtm