diff --git a/Dockerfile b/Dockerfile index a5da791..7ef69dc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,8 +8,8 @@ FROM ${IMG_FROM_URL} ARG IMG_NAME ARG IMG_NAME_FULL ARG IMG_VERSION -ARG IMG_URL ARG IMG_MAINTAINER +ARG IMG_URL LABEL org.rx3.${IMG_NAME}.name=${IMG_NAME_FULL} LABEL org.rx3.${IMG_NAME}.version=${IMG_VERSION} @@ -37,23 +37,41 @@ ARG SERVER_SV_HTTPD_CSS=/usr/lib/python3.10/site-packages/supervisor/ui/styleshe #----------------------------------------------------------------------------------------------------------------------- ARG SERVER_SV_HTML_IMG_B='status" />' +#----------------------------------------------------------------------------------------------------------------------- + + + #----------------------------------------------------------------------------------------------------------------------- ARG SERVER_SV_HTML_IMG_A='status"/> \n\
IMG_NAME_VERSION \n\
\n\ \n\ + \n\ + \n\ + \n\ + \n\ + \n\ + \n\ + \n\ + \n\ + \n\ + \n\ \n\ IMG_STACK_LOG \n\ \n\
IdDateTimeRegistryImageTag
\n\
\n\ -
' \n\ + ' #----------------------------------------------------------------------------------------------------------------------- - #----------------------------------------------------------------------------------------------------------------------- ARG SERVER_SV_CSS_HEADER_B='repeat-x;' +#----------------------------------------------------------------------------------------------------------------------- + + + + #----------------------------------------------------------------------------------------------------------------------- ARG SERVER_SV_CSS_HEADER_A='repeat-x; \n\ display: flex; \n\ @@ -95,10 +113,11 @@ ARG SERVER_SV_CSS_HEADER_A='repeat-x; white-space: nowrap; \n\ padding: 4px 8px; \n\ border: 1px solid #666; \n\ + font-size: 12px; \n\ } \n\ \n\ \#isl-tab table th { \n\ - border-bottom: 1px solid #888; \n\ + background: #333; \n\ } \n\ \n\ \#isl-tab table { \n\ @@ -106,7 +125,6 @@ ARG SERVER_SV_CSS_HEADER_A='repeat-x; width: fit-content; \n\ max-width: 500px; \n\ overflow-x: auto; \n\ - border: 1px solid #666; \n\ ' #----------------------------------------------------------------------------------------------------------------------- @@ -213,8 +231,8 @@ fi \n\ cp '${SERVER_SV_HTTPD_CSS}.ref' '${SERVER_SV_HTTPD_CSS}' \n\ cp '${SERVER_SV_HTTPD_PAGE}.ref' '${SERVER_SV_HTTPD_PAGE}' \n\ -sed -i -e "s%IMG_NAME_VERSION%$(isl_last)%" '${SERVER_SV_HTTPD_PAGE}' \n\ -sed -i -e "s%IMG_STACK_LOG%$(isl_html_dump)%" '${SERVER_SV_HTTPD_PAGE}' \n\ +sed -i -e "s%IMG_NAME_VERSION%$(isl_top -i)%" '${SERVER_SV_HTTPD_PAGE}' \n\ +sed -i -e "s%IMG_STACK_LOG%$(isl_html_dump -i)%" '${SERVER_SV_HTTPD_PAGE}' \n\ \n\ exec supervisord -c /etc/supervisord.conf' #----------------------------------------------------------------------------------------------------------------------- diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index 48dce5e..1ac18f5 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -1,5 +1,5 @@ ------------------------------------------------------------------------------------------------------------------------------------ -Rx3-Docker/Server V 1.3.0 - A. GIBERT - 2026/02/13 +Rx3-Docker/Server V 1.3.0 - A. GIBERT - 2026/02/14 ------------------------------------------------------------------------------------------------------------------------------------ - Add ISL support, diff --git a/compose.yaml b/compose.yaml index 0d62285..a0a3976 100644 --- a/compose.yaml +++ b/compose.yaml @@ -17,8 +17,8 @@ services: IMG_NAME: ${IMG_NAME} IMG_NAME_FULL: ${IMG_NAME_FULL} IMG_VERSION: ${IMG_VERSION} - IMG_URL: ${IMG_URL} IMG_MAINTAINER: ${IMG_MAINTAINER} + IMG_URL: ${IMG_URL} IMG_FROM_URL: ${IMG_FROM_URL} SERVER_LOG_INIT_DIR: ${SERVER_LOG_INIT_DIR}