mirror of
https://github.com/alexbelgium/hassio-addons.git
synced 2026-06-06 23:55:56 +02:00
Merge pull request #2542 from alexbelgium/copilot/fix-vnc-connection-issue
Fix corrupted HEALTH_URL/HEALTH_PORT in Dockerfiles and prevent recurrence in updater
This commit is contained in:
@@ -319,6 +319,12 @@ for f in */; do
|
|||||||
LASTVERSION2=${LASTVERSION//+/-}
|
LASTVERSION2=${LASTVERSION//+/-}
|
||||||
CURRENT2=${CURRENT//+/-}
|
CURRENT2=${CURRENT//+/-}
|
||||||
|
|
||||||
|
# Skip if current or last version is empty (would corrupt files by replacing all "" occurrences)
|
||||||
|
if [ "${CURRENT}" = '""' ] || [ "${LASTVERSION}" = '""' ]; then
|
||||||
|
bashio::log.warning "... $SLUG : skipping update due to empty version string (current=${CURRENT}, latest=${LASTVERSION})"
|
||||||
|
continue
|
||||||
|
fi
|
||||||
|
|
||||||
# Update if needed
|
# Update if needed
|
||||||
if [ "${CURRENT2}" != "${LASTVERSION2}" ]; then
|
if [ "${CURRENT2}" != "${LASTVERSION2}" ]; then
|
||||||
LOGINFO="... $SLUG : update from ${CURRENT} to ${LASTVERSION}" && if [ "$VERBOSE" = true ]; then bashio::log.info "$LOGINFO"; fi
|
LOGINFO="... $SLUG : update from ${CURRENT} to ${LASTVERSION}" && if [ "$VERBOSE" = true ]; then bashio::log.info "$LOGINFO"; fi
|
||||||
|
|||||||
@@ -2,11 +2,11 @@
|
|||||||
# ALEXBELGIUM'S DOCKERFILE #
|
# ALEXBELGIUM'S DOCKERFILE #
|
||||||
#============================#
|
#============================#
|
||||||
# _.------.
|
# _.------.
|
||||||
# _.-` ('>.-`"0.8.13""-.
|
# _.-` ('>.-`"""-.
|
||||||
# '.--'` _'` _ .--.)
|
# '.--'` _'` _ .--.)
|
||||||
# -' '-.-';` `
|
# -' '-.-';` `
|
||||||
# ' - _.' ``'--.
|
# ' - _.' ``'--.
|
||||||
# '---` .-'"0.8.13"`
|
# '---` .-'""`
|
||||||
# /`
|
# /`
|
||||||
#=== Home Assistant Addon ===#
|
#=== Home Assistant Addon ===#
|
||||||
|
|
||||||
|
|||||||
@@ -2,11 +2,11 @@
|
|||||||
# ALEXBELGIUM'S DOCKERFILE #
|
# ALEXBELGIUM'S DOCKERFILE #
|
||||||
#============================#
|
#============================#
|
||||||
# _.------.
|
# _.------.
|
||||||
# _.-` ('>.-`"0.8.2""-.
|
# _.-` ('>.-`"""-.
|
||||||
# '.--'` _'` _ .--.)
|
# '.--'` _'` _ .--.)
|
||||||
# -' '-.-';` `
|
# -' '-.-';` `
|
||||||
# ' - _.' ``'--.
|
# ' - _.' ``'--.
|
||||||
# '---` .-'"0.8.2"`
|
# '---` .-'""`
|
||||||
# /`
|
# /`
|
||||||
#=== Home Assistant Addon ===#
|
#=== Home Assistant Addon ===#
|
||||||
|
|
||||||
|
|||||||
@@ -2,11 +2,11 @@
|
|||||||
# ALEXBELGIUM'S DOCKERFILE #
|
# ALEXBELGIUM'S DOCKERFILE #
|
||||||
#============================#
|
#============================#
|
||||||
# _.------.
|
# _.------.
|
||||||
# _.-` ('>.-`"1.6.0-bullseye""-.
|
# _.-` ('>.-`"""-.
|
||||||
# '.--'` _'` _ .--.)
|
# '.--'` _'` _ .--.)
|
||||||
# -' '-.-';` `
|
# -' '-.-';` `
|
||||||
# ' - _.' ``'--.
|
# ' - _.' ``'--.
|
||||||
# '---` .-'"1.6.0-bullseye"`
|
# '---` .-'""`
|
||||||
# /`
|
# /`
|
||||||
#=== Home Assistant Addon ===#
|
#=== Home Assistant Addon ===#
|
||||||
|
|
||||||
@@ -134,7 +134,7 @@ LABEL \
|
|||||||
#################
|
#################
|
||||||
|
|
||||||
ENV HEALTH_PORT="8080" \
|
ENV HEALTH_PORT="8080" \
|
||||||
HEALTH_URL="1.6.0-bullseye"
|
HEALTH_URL=""
|
||||||
HEALTHCHECK \
|
HEALTHCHECK \
|
||||||
--interval=5s \
|
--interval=5s \
|
||||||
--retries=5 \
|
--retries=5 \
|
||||||
|
|||||||
@@ -2,11 +2,11 @@
|
|||||||
# ALEXBELGIUM'S DOCKERFILE #
|
# ALEXBELGIUM'S DOCKERFILE #
|
||||||
#============================#
|
#============================#
|
||||||
# _.------.
|
# _.------.
|
||||||
# _.-` ('>.-`"ubuntu-2025-11-30""-.
|
# _.-` ('>.-`"""-.
|
||||||
# '.--'` _'` _ .--.)
|
# '.--'` _'` _ .--.)
|
||||||
# -' '-.-';` `
|
# -' '-.-';` `
|
||||||
# ' - _.' ``'--.
|
# ' - _.' ``'--.
|
||||||
# '---` .-'"ubuntu-2025-11-30"`
|
# '---` .-'""`
|
||||||
# /`
|
# /`
|
||||||
#=== Home Assistant Addon ===#
|
#=== Home Assistant Addon ===#
|
||||||
|
|
||||||
@@ -134,8 +134,8 @@ RUN \
|
|||||||
mv /etc/nginx/nginx.conf.new /etc/nginx/nginx.conf; \
|
mv /etc/nginx/nginx.conf.new /etc/nginx/nginx.conf; \
|
||||||
fi
|
fi
|
||||||
|
|
||||||
ENV HEALTH_PORT="ubuntu-2025-11-30" \
|
ENV HEALTH_PORT="2341" \
|
||||||
HEALTH_URL="ubuntu-2025-11-30"
|
HEALTH_URL=""
|
||||||
HEALTHCHECK \
|
HEALTHCHECK \
|
||||||
--interval=5m \
|
--interval=5m \
|
||||||
--retries=5 \
|
--retries=5 \
|
||||||
|
|||||||
@@ -2,11 +2,11 @@
|
|||||||
# ALEXBELGIUM'S DOCKERFILE #
|
# ALEXBELGIUM'S DOCKERFILE #
|
||||||
#============================#
|
#============================#
|
||||||
# _.------.
|
# _.------.
|
||||||
# _.-` ('>.-`"12.0.14""-.
|
# _.-` ('>.-`"""-.
|
||||||
# '.--'` _'` _ .--.)
|
# '.--'` _'` _ .--.)
|
||||||
# -' '-.-';` `
|
# -' '-.-';` `
|
||||||
# ' - _.' ``'--.
|
# ' - _.' ``'--.
|
||||||
# '---` .-'"12.0.14"`
|
# '---` .-'""`
|
||||||
# /`
|
# /`
|
||||||
#=== Home Assistant Addon ===#
|
#=== Home Assistant Addon ===#
|
||||||
|
|
||||||
|
|||||||
@@ -2,11 +2,11 @@
|
|||||||
# ALEXBELGIUM'S DOCKERFILE #
|
# ALEXBELGIUM'S DOCKERFILE #
|
||||||
#============================#
|
#============================#
|
||||||
# _.------.
|
# _.------.
|
||||||
# _.-` ('>.-`"2.58.02""-.
|
# _.-` ('>.-`"""-.
|
||||||
# '.--'` _'` _ .--.)
|
# '.--'` _'` _ .--.)
|
||||||
# -' '-.-';` `
|
# -' '-.-';` `
|
||||||
# ' - _.' ``'--.
|
# ' - _.' ``'--.
|
||||||
# '---` .-'"2.58.02"`
|
# '---` .-'""`
|
||||||
# /`
|
# /`
|
||||||
#=== Home Assistant Addon ===#
|
#=== Home Assistant Addon ===#
|
||||||
|
|
||||||
@@ -119,7 +119,7 @@ RUN \
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
ENV HEALTH_PORT="8265" \
|
ENV HEALTH_PORT="8265" \
|
||||||
HEALTH_URL="2.58.02"
|
HEALTH_URL=""
|
||||||
HEALTHCHECK \
|
HEALTHCHECK \
|
||||||
--interval=5s \
|
--interval=5s \
|
||||||
--retries=5 \
|
--retries=5 \
|
||||||
|
|||||||
Reference in New Issue
Block a user