mirror of
https://github.com/alexbelgium/hassio-addons.git
synced 2026-01-09 17:31:03 +01:00
Compare commits
12 Commits
1669f63f21
...
72549986f1
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
72549986f1 | ||
|
|
9321dc9345 | ||
|
|
af41c2bce6 | ||
|
|
b35dd4f992 | ||
|
|
681590e9b1 | ||
|
|
dd66f4b497 | ||
|
|
72a99d056a | ||
|
|
fb1e3374a7 | ||
|
|
64f0656e84 | ||
|
|
2500a30186 | ||
|
|
4a75b76a19 | ||
|
|
573c9721c6 |
@@ -237,9 +237,10 @@ for files in "/etc/services.d" "/etc/cont-init.d"; do
|
|||||||
# Bashio
|
# Bashio
|
||||||
if grep -q -rnw "$files/" -e 'bashio' && [ ! -f "/usr/bin/bashio" ]; then
|
if grep -q -rnw "$files/" -e 'bashio' && [ ! -f "/usr/bin/bashio" ]; then
|
||||||
[ "$VERBOSE" = true ] && echo "install bashio"
|
[ "$VERBOSE" = true ] && echo "install bashio"
|
||||||
BASHIO_VERSION="0.14.3"
|
BASHIO_VERSION="latest"
|
||||||
mkdir -p /tmp/bashio
|
mkdir -p /tmp/bashio
|
||||||
curl -f -L -s -S "https://github.com/hassio-addons/bashio/archive/v${BASHIO_VERSION}.tar.gz" | tar -xzf - --strip 1 -C /tmp/bashio
|
BASHIO_TAG="$(curl -f -L -s -S "https://api.github.com/repos/hassio-addons/bashio/releases/${BASHIO_VERSION}" | awk -F '\"' '/tag_name/{print $4; exit}')"
|
||||||
|
curl -f -L -s -S "https://github.com/hassio-addons/bashio/archive/${BASHIO_TAG}.tar.gz" | tar -xzf - --strip 1 -C /tmp/bashio
|
||||||
mv /tmp/bashio/lib /usr/lib/bashio
|
mv /tmp/bashio/lib /usr/lib/bashio
|
||||||
ln -s /usr/lib/bashio/bashio /usr/bin/bashio
|
ln -s /usr/lib/bashio/bashio /usr/bin/bashio
|
||||||
rm -rf /tmp/bashio
|
rm -rf /tmp/bashio
|
||||||
|
|||||||
@@ -1,5 +1,20 @@
|
|||||||
|
## alpine-sts (30-12-2025)
|
||||||
|
|
||||||
|
- Fix: Restore official Portainer Agent image source - Fix circular dependency (Fixes #2318)
|
||||||
|
- Revert COPY --from to use official ghcr.io/portainerci/agent:latest instead of self-reference
|
||||||
|
- Restored multi-architecture support via ARG BUILD_FROM/ARG BUILD_ARCH (fixes aarch64 builds)
|
||||||
|
- Removed stderr suppression to preserve error messages for user diagnostics
|
||||||
|
- This fixes build failures that prevented users from updating
|
||||||
|
- Updated config.yaml version tag to match buildable image tag
|
||||||
|
|
||||||
## alpine-sts-bashio-fix (29-12-2025)
|
## alpine-sts-bashio-fix (29-12-2025)
|
||||||
|
|
||||||
|
- Fix: PROTECTION MODE IS ENABLED error when protection mode is OFF (Fixes #2307)
|
||||||
|
- Update bashio from v0.17.5 → main branch for improved API error handling
|
||||||
|
- Add robust protection mode check with Docker socket fallback
|
||||||
|
- Tested and verified working on Home Assistant OS
|
||||||
|
|
||||||
|
|
||||||
- Fix: PROTECTION MODE IS ENABLED error when protection mode is OFF (Fixes #2307)
|
- Fix: PROTECTION MODE IS ENABLED error when protection mode is OFF (Fixes #2307)
|
||||||
- Update bashio from v0.17.5 → main branch for improved API error handling
|
- Update bashio from v0.17.5 → main branch for improved API error handling
|
||||||
- Add robust protection mode check with Docker socket fallback
|
- Add robust protection mode check with Docker socket fallback
|
||||||
|
|||||||
@@ -8,16 +8,21 @@ FROM $BUILD_FROM
|
|||||||
|
|
||||||
# Step 1: Replace bashio v0.17.5 with main branch for improved API error handling
|
# Step 1: Replace bashio v0.17.5 with main branch for improved API error handling
|
||||||
RUN rm -rf /usr/lib/bashio /usr/bin/bashio && \
|
RUN rm -rf /usr/lib/bashio /usr/bin/bashio && \
|
||||||
curl -J -L -o /tmp/bashio.tar.gz \
|
curl -f -J -L -o /tmp/bashio.tar.gz \
|
||||||
"https://github.com/hassio-addons/bashio/archive/main.tar.gz" && \
|
"https://github.com/hassio-addons/bashio/archive/main.tar.gz" && \
|
||||||
|
test -f /tmp/bashio.tar.gz && test -s /tmp/bashio.tar.gz || \
|
||||||
|
(echo "ERROR: bashio download failed or file is empty" && exit 1) && \
|
||||||
mkdir /tmp/bashio && \
|
mkdir /tmp/bashio && \
|
||||||
tar -xzf /tmp/bashio.tar.gz --strip 1 -C /tmp/bashio && \
|
tar -xzf /tmp/bashio.tar.gz --strip 1 -C /tmp/bashio || \
|
||||||
|
(echo "ERROR: bashio tar extraction failed" && exit 1) && \
|
||||||
|
test -d /tmp/bashio/lib || \
|
||||||
|
(echo "ERROR: bashio lib directory not found after extraction" && exit 1) && \
|
||||||
mv /tmp/bashio/lib /usr/lib/bashio && \
|
mv /tmp/bashio/lib /usr/lib/bashio && \
|
||||||
ln -s /usr/lib/bashio/bashio /usr/bin/bashio && \
|
ln -s /usr/lib/bashio/bashio /usr/bin/bashio && \
|
||||||
rm -rf /tmp/bashio /tmp/bashio.tar.gz
|
rm -rf /tmp/bashio /tmp/bashio.tar.gz
|
||||||
|
|
||||||
# Step 2: Get agent from official image
|
# Step 2: Get agent from official image
|
||||||
COPY --from=ghcr.io/alexbelgium/portainer_agent-${BUILD_ARCH}:alpine-sts /app /app
|
COPY --from=ghcr.io/portainerci/agent:latest /app /app
|
||||||
|
|
||||||
# Step 3: Add tzdata and timezone support
|
# Step 3: Add tzdata and timezone support
|
||||||
RUN apk add --no-cache tzdata
|
RUN apk add --no-cache tzdata
|
||||||
@@ -30,7 +35,7 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \
|
|||||||
S6_SERVICES_GRACETIME=0
|
S6_SERVICES_GRACETIME=0
|
||||||
|
|
||||||
# Step 5: Copy rootfs from official image
|
# Step 5: Copy rootfs from official image
|
||||||
COPY --from=ghcr.io/alexbelgium/portainer_agent-${BUILD_ARCH}:alpine-sts / /
|
COPY --from=ghcr.io/portainerci/agent:latest / /
|
||||||
|
|
||||||
# Step 6: Override the run script with simplified protection mode check
|
# Step 6: Override the run script with simplified protection mode check
|
||||||
RUN mkdir -p /etc/services.d/portainer_agent
|
RUN mkdir -p /etc/services.d/portainer_agent
|
||||||
@@ -96,7 +101,7 @@ bashio::require.unprotected.fixed
|
|||||||
bashio::log.info "Starting Portainer Agent"
|
bashio::log.info "Starting Portainer Agent"
|
||||||
|
|
||||||
# Launch app
|
# Launch app
|
||||||
cd /app
|
cd /app || true
|
||||||
if bashio::config.has_value 'PORTAINER_AGENT_ARGS'; then
|
if bashio::config.has_value 'PORTAINER_AGENT_ARGS'; then
|
||||||
./agent "$PORTAINER_AGENT_ARGS"
|
./agent "$PORTAINER_AGENT_ARGS"
|
||||||
else
|
else
|
||||||
|
|||||||
@@ -41,4 +41,4 @@ schema:
|
|||||||
slug: portainer_agent
|
slug: portainer_agent
|
||||||
udev: true
|
udev: true
|
||||||
url: https://github.com/alexbelgium/hassio-addons
|
url: https://github.com/alexbelgium/hassio-addons
|
||||||
version: "alpine-sts-bashio-fix"
|
version: "alpine-sts"
|
||||||
|
|||||||
Reference in New Issue
Block a user