release rc

This commit is contained in:
qiaofeng1227 2024-12-13 14:55:10 +08:00
parent ff9bb79330
commit cdfddb7062
5 changed files with 9 additions and 5 deletions

View File

@ -1,4 +1,5 @@
### enhancement: ### enhancement:
- cockpit upgradeport change to 9090 when linux upgrage #556
- upgrade error at CentOS Stream #554 - upgrade error at CentOS Stream #554
- Optimize install_docker.sh #547 - Optimize install_docker.sh #547
- Nginxproxymanage add named volume nginx_custom #527 - Nginxproxymanage add named volume nginx_custom #527

View File

@ -1,4 +1,4 @@
APPHUB_VERSION=0.1.6 APPHUB_VERSION=0.1.6
DEPLOYMENT_VERSION=2.20.3 DEPLOYMENT_VERSION=2.20.3
GIT_VERSION=1.21.9 GIT_VERSION=1.21.9
PROXY_VERSION=2.11.3-rc9 PROXY_VERSION=2.11.3

View File

@ -1,11 +1,11 @@
# modify time: 202412130835, you can modify here to trigger Docker Build action # modify time: 202412131435, you can modify here to trigger Docker Build action
# from Dockerfile: https://github.com/NginxProxyManager/nginx-proxy-manager/blob/develop/docker/Dockerfile # from Dockerfile: https://github.com/NginxProxyManager/nginx-proxy-manager/blob/develop/docker/Dockerfile
# from image: https://hub.docker.com/r/jc21/nginx-proxy-manager # from image: https://hub.docker.com/r/jc21/nginx-proxy-manager
FROM jc21/nginx-proxy-manager:2.11.3 FROM jc21/nginx-proxy-manager:2.11.3
LABEL maintainer="Websoft9<help@websoft9.com>" LABEL maintainer="Websoft9<help@websoft9.com>"
LABEL version="2.11.3-rc9" LABEL version="2.11.3"
COPY README.md /data/nginx/README.md COPY README.md /data/nginx/README.md
RUN mkdir /data/nginx/custom RUN mkdir /data/nginx/custom

View File

@ -58,8 +58,11 @@ set_Firewalld(){
firewall-cmd --reload 2>/dev/nul firewall-cmd --reload 2>/dev/nul
} }
# when websoft9 restart, sync cockpit port
on_change
# monitor /lib/systemd/system/cockpit.socket and config.ini, make sure config.ini port is the same with cockpit.socket # monitor /lib/systemd/system/cockpit.socket and config.ini, make sure config.ini port is the same with cockpit.socket
inotifywait -e modify -m $FILES | while read PATH EVENT FILE; do inotifywait -e modify,attrib -m $FILES | while read PATH EVENT FILE; do
echo "Set cockpit port by config.ini..." echo "Set cockpit port by config.ini..."
export PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:$PATH export PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:$PATH
on_change on_change

View File

@ -1,5 +1,5 @@
{ {
"version": "2.1.17-rc1", "version": "2.1.17-rc2",
"plugins": { "plugins": {
"portainer": "0.1.3", "portainer": "0.1.3",
"nginx": "0.1.0", "nginx": "0.1.0",