diff --git a/Dockerfile b/Dockerfile index 0708d18..57a859d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -33,11 +33,12 @@ sed -i "s/$conf\[`extra_login_security`\] = true;/$conf\[`extra_login_security`\ -RUN urpmi --force wget \ - && mkdir -p /var/www/appl \ - && wget -q -O- "https://github.com/${PHPPGADMIN_OWNER}/phppgadmin/archive/${PHPPGADMIN_COMMIT}.tar.gz" | tar xzf - -C ${APACHE_DOC_ROOT} \ - && mv ${APACHE_DOC_ROOT}/phppgadmin-${PHPPGADMIN_COMMIT} ${APACHE_DOC_ROOT}/phppgadmin \ - && cp ${APACHE_DOC_ROOT}/phppgadmin/conf/config.inc.php-dist ${APACHE_DOC_ROOT}/phppgadmin/conf/config.inc.php \ - && echo -e "${TOOLSD}" | sed -e "s/\`/'/g" -e 's/ *$//' > /etc/init.d/toolsd \ - && chmod a+x /etc/init.d/toolsd \ +RUN urpmi --force wget \ + && mkdir -p /var/www/appl \ + && wget -q -O- "https://github.com/${PHPPGADMIN_OWNER}/phppgadmin/archive/${PHPPGADMIN_COMMIT}.tar.gz" | tar xzf - -C ${APACHE_DOC_ROOT} \ + && mv ${APACHE_DOC_ROOT}/phppgadmin-${PHPPGADMIN_COMMIT} ${APACHE_DOC_ROOT}/phppgadmin \ + && sed -i 's/$_SERVER\['\''REQUEST_URI'\''\]/preg_replace(\"\/^\\\/phppgadmin\\\/\/", "", $_SERVER['\''REQUEST_URI'\''])/g' ${APACHE_DOC_ROOT}/phppgadmin/display.php \ + && cp ${APACHE_DOC_ROOT}/phppgadmin/conf/config.inc.php-dist ${APACHE_DOC_ROOT}/phppgadmin/conf/config.inc.php \ + && echo -e "${TOOLSD}" | sed -e "s/\`/'/g" -e 's/ *$//' > /etc/init.d/toolsd \ + && chmod a+x /etc/init.d/toolsd \ && ln -s /etc/init.d/toolsd /etc/rcD.d/S40toolsd diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index 7b9890f..c00baff 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -1,3 +1,11 @@ +------------------------------------------------------------------------------------------------------------------------------------ +Rx3/Tools-Mga9 V 1.0.2 - A. GIBERT - 2024/10/29 +------------------------------------------------------------------------------------------------------------------------------------ + +- Patch phppgadmin to fully support reverse proxy (display.php). + + + ------------------------------------------------------------------------------------------------------------------------------------ Rx3/Tools-Mga9 V 1.0.1 - A. GIBERT - 2024/10/07 ------------------------------------------------------------------------------------------------------------------------------------ diff --git a/compose.yaml b/compose.yaml index 5f42a5b..a058267 100644 --- a/compose.yaml +++ b/compose.yaml @@ -5,7 +5,7 @@ name: ${IMG_NAME} services: - webapp: + webtools: container_name: ${IMG_NAME} image: ${IMG_URL} diff --git a/env b/env index d7b5831..044caac 100644 --- a/env +++ b/env @@ -18,7 +18,7 @@ IMG_URL_PREFIX="${IMG_REGISTRY}/${IMG_ORG}" IMG_NAME="tools-mga9" IMG_FULL_NAME="Rx3 Tools Mageia-9 Docker Image" -IMG_VERSION="1.0.1" +IMG_VERSION="1.0.2" IMG_URL="${IMG_URL_PREFIX}/${IMG_NAME}:${IMG_VERSION}" IMG_MAINTAINER='"Arnaud G. GIBERT" '