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

- In the ISL popup:

Browse Source 
- Add line shading,
  - Remove table border,
- Add Rx3 in the superviosr HTML footer.
This commit is contained in:
Arnaud G. GIBERT
2026-02-14 20:00:53 +01:00
parent 73ef6b46d5
commit 258b6f3041
3 changed files with 33 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
Dockerfile
View File

@@ -39,8 +39,6 @@ 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\
<div id="isl">IMG_NAME_VERSION \n\
@@ -65,19 +63,27 @@ IMG_STACK_LOG
#-----------------------------------------------------------------------------------------------------------------------
#-----------------------------------------------------------------------------------------------------------------------
ARG SERVER_SV_HTML_VERSION_B='version">#</span>'
#-----------------------------------------------------------------------------------------------------------------------
#-----------------------------------------------------------------------------------------------------------------------
ARG SERVER_SV_HTML_VERSION_A='version">#</span> + <a href="https://www.rx3.net/">Rx<sup>3</sup></a> Image Stack Log support'
#-----------------------------------------------------------------------------------------------------------------------
#-----------------------------------------------------------------------------------------------------------------------
ARG SERVER_SV_CSS_HEADER_B='repeat-x;'
#-----------------------------------------------------------------------------------------------------------------------
#-----------------------------------------------------------------------------------------------------------------------
ARG SERVER_SV_CSS_HEADER_A='repeat-x; \n\
display: flex; \n\
align-items: center; \n\
justify-content: space-between; \n\
font-size: 14px; \n\
font-size: 16px; \n\
font-weight: bold; \n\
} \n\
\n\
@@ -97,8 +103,8 @@ ARG SERVER_SV_CSS_HEADER_A='repeat-x;
position: absolute; \n\
z-index: 1; \n\
top: 100%; \n\
left: 50%; \n\
transform: translateX(-50%); \n\
right: 0; \n\
transform: none; \n\
opacity: 0; \n\
transition: opacity 0.3s; \n\
} \n\
@@ -112,8 +118,8 @@ ARG SERVER_SV_CSS_HEADER_A='repeat-x;
\#isl-tab table th { \n\
white-space: nowrap; \n\
padding: 4px 8px; \n\
border: 1px solid #666; \n\
font-size: 12px; \n\
border: 0px solid #666; \n\
font-size: 14px; \n\
} \n\
\n\
\#isl-tab table th { \n\
@@ -158,6 +164,8 @@ do
done'
#-----------------------------------------------------------------------------------------------------------------------
#-----------------------------------------------------------------------------------------------------------------------
ARG CROND='#!/bin/bash \n\
\n\
@@ -170,6 +178,8 @@ else
fi'
#-----------------------------------------------------------------------------------------------------------------------
#-----------------------------------------------------------------------------------------------------------------------
ARG DNSMASQ='#!/bin/bash \n\
\n\
@@ -219,6 +229,8 @@ else
fi'
#-----------------------------------------------------------------------------------------------------------------------
#-----------------------------------------------------------------------------------------------------------------------
ARG SUPERVISORD='#!/bin/bash \n\
\n\
@@ -237,16 +249,22 @@ sed -i -e "s%IMG_STACK_LOG%$(isl_html_dump -i)%"
exec supervisord -c /etc/supervisord.conf'
#-----------------------------------------------------------------------------------------------------------------------
#-----------------------------------------------------------------------------------------------------------------------
ARG CROND_INI='[program:crond] \n\
command=crond -n'
#-----------------------------------------------------------------------------------------------------------------------
#-----------------------------------------------------------------------------------------------------------------------
ARG DNSMASQ_INI='[program:dnsmasq] \n\
command=dnsmasq -k'
#-----------------------------------------------------------------------------------------------------------------------
#-----------------------------------------------------------------------------------------------------------------------
ARG SUPERVISORD_INI='[supervisord] \n\
nodaemon=true \n\
@@ -254,6 +272,8 @@ childlogdir='${SERVER_LOG_SV_DIR}'
user=root'
#-----------------------------------------------------------------------------------------------------------------------
#-----------------------------------------------------------------------------------------------------------------------
ARG SUPERVISORD_HTTPD_INI='[inet_http_server] \n\
port=*:'${SERVER_PORT_SV_INT}
@@ -286,6 +306,7 @@ RUN . /etc/profile.d/rx3.sh && isl_add ${IMG_URL}
&& mv "${SERVER_DNSMASQ_CONF}" "${SERVER_DNSMASQ_CONF}.dist" \
&& mv "${SERVER_SV_HTTPD_PAGE}" "${SERVER_SV_HTTPD_PAGE}.ref" \
&& sed -i -e "s%${SERVER_SV_HTML_IMG_B}%${SERVER_SV_HTML_IMG_A}%" "${SERVER_SV_HTTPD_PAGE}.ref" \
&& sed -i -e "s%${SERVER_SV_HTML_VERSION_B}%${SERVER_SV_HTML_VERSION_A}%" "${SERVER_SV_HTTPD_PAGE}.ref" \
&& mv "${SERVER_SV_HTTPD_CSS}" "${SERVER_SV_HTTPD_CSS}.ref" \
&& sed -i -e "s/${SERVER_SV_CSS_HEADER_B}/${SERVER_SV_CSS_HEADER_A}/" "${SERVER_SV_HTTPD_CSS}.ref"