Rx3-Docker/server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 14 Wiki Activity

- Add header to supervisor ISL popup,

Browse Source 
- Minor font and color fixes to ISL popup.
This commit is contained in:
Arnaud G. GIBERT
2026-02-14 11:59:42 +01:00
parent 448c084b2f
commit 73ef6b46d5
3 changed files with 27 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
Dockerfile
View File

@@ -8,8 +8,8 @@ FROM ${IMG_FROM_URL}
ARG IMG_NAME ARG IMG_NAME
ARG IMG_NAME_FULL ARG IMG_NAME_FULL
ARG IMG_VERSION ARG IMG_VERSION
ARG IMG_URL
ARG IMG_MAINTAINER ARG IMG_MAINTAINER
ARG IMG_URL
LABEL org.rx3.${IMG_NAME}.name=${IMG_NAME_FULL} LABEL org.rx3.${IMG_NAME}.name=${IMG_NAME_FULL}
LABEL org.rx3.${IMG_NAME}.version=${IMG_VERSION} 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_B='status" />'
#-----------------------------------------------------------------------------------------------------------------------
#----------------------------------------------------------------------------------------------------------------------- #-----------------------------------------------------------------------------------------------------------------------
ARG SERVER_SV_HTML_IMG_A='status"/> \n\ ARG SERVER_SV_HTML_IMG_A='status"/> \n\
<div id="isl">IMG_NAME_VERSION \n\ <div id="isl">IMG_NAME_VERSION \n\
<div id="isl-tab"> \n\ <div id="isl-tab"> \n\
<table> \n\ <table> \n\
<thead> \n\
<tr> \n\
<th>Id</th> \n\
<th>Date</th> \n\
<th>Time</th> \n\
<th>Registry</th> \n\
<th>Image</th> \n\
<th>Tag</th> \n\
</tr> \n\
</thead> \n\
<tbody> \n\ <tbody> \n\
IMG_STACK_LOG \n\ IMG_STACK_LOG \n\
</tbody> \n\ </tbody> \n\
</table> \n\ </table> \n\
</div> \n\ </div> \n\
</div>' \n\ </div>'
#----------------------------------------------------------------------------------------------------------------------- #-----------------------------------------------------------------------------------------------------------------------
#----------------------------------------------------------------------------------------------------------------------- #-----------------------------------------------------------------------------------------------------------------------
ARG SERVER_SV_CSS_HEADER_B='repeat-x;' ARG SERVER_SV_CSS_HEADER_B='repeat-x;'
#-----------------------------------------------------------------------------------------------------------------------
#----------------------------------------------------------------------------------------------------------------------- #-----------------------------------------------------------------------------------------------------------------------
ARG SERVER_SV_CSS_HEADER_A='repeat-x; \n\ ARG SERVER_SV_CSS_HEADER_A='repeat-x; \n\
display: flex; \n\ display: flex; \n\
@@ -95,10 +113,11 @@ ARG SERVER_SV_CSS_HEADER_A='repeat-x;
white-space: nowrap; \n\ white-space: nowrap; \n\
padding: 4px 8px; \n\ padding: 4px 8px; \n\
border: 1px solid #666; \n\ border: 1px solid #666; \n\
font-size: 12px; \n\
} \n\ } \n\
\n\ \n\
\#isl-tab table th { \n\ \#isl-tab table th { \n\
border-bottom: 1px solid #888; \n\ background: #333; \n\
} \n\ } \n\
\n\ \n\
\#isl-tab table { \n\ \#isl-tab table { \n\
@@ -106,7 +125,6 @@ ARG SERVER_SV_CSS_HEADER_A='repeat-x;
width: fit-content; \n\ width: fit-content; \n\
max-width: 500px; \n\ max-width: 500px; \n\
overflow-x: auto; \n\ overflow-x: auto; \n\
border: 1px solid #666; \n\
' '
#----------------------------------------------------------------------------------------------------------------------- #-----------------------------------------------------------------------------------------------------------------------
@@ -213,8 +231,8 @@ fi
\n\ \n\
cp '${SERVER_SV_HTTPD_CSS}.ref' '${SERVER_SV_HTTPD_CSS}' \n\ cp '${SERVER_SV_HTTPD_CSS}.ref' '${SERVER_SV_HTTPD_CSS}' \n\
cp '${SERVER_SV_HTTPD_PAGE}.ref' '${SERVER_SV_HTTPD_PAGE}' \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_NAME_VERSION%$(isl_top -i)%" '${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_STACK_LOG%$(isl_html_dump -i)%" '${SERVER_SV_HTTPD_PAGE}' \n\
\n\ \n\
exec supervisord -c /etc/supervisord.conf' exec supervisord -c /etc/supervisord.conf'
#----------------------------------------------------------------------------------------------------------------------- #-----------------------------------------------------------------------------------------------------------------------

2
ReleaseNotes.txt
View File

@@ -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, - Add ISL support,

2
compose.yaml
View File

@@ -17,8 +17,8 @@ services:
IMG_NAME: ${IMG_NAME} IMG_NAME: ${IMG_NAME}
IMG_NAME_FULL: ${IMG_NAME_FULL} IMG_NAME_FULL: ${IMG_NAME_FULL}
IMG_VERSION: ${IMG_VERSION} IMG_VERSION: ${IMG_VERSION}
IMG_URL: ${IMG_URL}
IMG_MAINTAINER: ${IMG_MAINTAINER} IMG_MAINTAINER: ${IMG_MAINTAINER}
IMG_URL: ${IMG_URL}
IMG_FROM_URL: ${IMG_FROM_URL} IMG_FROM_URL: ${IMG_FROM_URL}
SERVER_LOG_INIT_DIR: ${SERVER_LOG_INIT_DIR} SERVER_LOG_INIT_DIR: ${SERVER_LOG_INIT_DIR}