Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

⬆️ Upgrades add-on base image to 12.0.0 #119

Merged
merged 1 commit into from
Jun 7, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions example/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG BUILD_FROM=ghcr.io/hassio-addons/base/amd64:11.1.0
ARG BUILD_FROM=ghcr.io/hassio-addons/base/amd64:12.0.0
# hadolint ignore=DL3006
FROM ${BUILD_FROM}

Expand All @@ -7,8 +7,8 @@ COPY rootfs /

# Setup base
RUN apk add --no-cache \
coreutils=9.0-r2 \
wget=1.21.2-r2
coreutils=9.1-r0 \
wget=1.21.3-r0

# Build arguments
ARG BUILD_ARCH
Expand Down
10 changes: 5 additions & 5 deletions example/build.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
---
build_from:
aarch64: ghcr.io/hassio-addons/base/aarch64:11.1.0
amd64: ghcr.io/hassio-addons/base/amd64:11.1.0
armhf: ghcr.io/hassio-addons/base/armhf:11.1.0
armv7: ghcr.io/hassio-addons/base/armv7:11.1.0
i386: ghcr.io/hassio-addons/base/i386:11.1.0
aarch64: ghcr.io/hassio-addons/base/aarch64:12.0.0
amd64: ghcr.io/hassio-addons/base/amd64:12.0.0
armhf: ghcr.io/hassio-addons/base/armhf:12.0.0
armv7: ghcr.io/hassio-addons/base/armv7:12.0.0
i386: ghcr.io/hassio-addons/base/i386:12.0.0
codenotary:
base_image: codenotary@frenck.dev
signer: codenotary@frenck.dev
10 changes: 6 additions & 4 deletions example/rootfs/etc/services.d/example1/finish
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
#!/usr/bin/execlineb -S0
#!/command/with-contenv bashio
# ==============================================================================
# Home Assistant Community Add-on: Example
# ==============================================================================
if -n { s6-test $# -ne 0 }
if -n { s6-test ${1} -eq 256 }
if [[ "${1}" -ne 0 ]] && [[ "${1}" -ne 256 ]]; then
bashio::log.warning "example 1 crashed, halting add-on"
/run/s6/basedir/bin/halt
fi

s6-svscanctl -t /var/run/s6/services
bashio::log.info "example 1 stoped, restarting..."
3 changes: 1 addition & 2 deletions example/rootfs/etc/services.d/example1/run
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
#!/usr/bin/with-contenv bashio
#!/command/with-contenv bashio
# ==============================================================================
# Home Assistant Community Add-on: Example
# Runs example1 script
# ==============================================================================


bashio::log.info "Starting Example1..."

exec /usr/bin/example1.sh
10 changes: 6 additions & 4 deletions example/rootfs/etc/services.d/example2/finish
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
#!/usr/bin/execlineb -S0
#!/command/with-contenv bashio
# ==============================================================================
# Home Assistant Community Add-on: Example
# ==============================================================================
if -n { s6-test $# -ne 0 }
if -n { s6-test ${1} -eq 256 }
if [[ "${1}" -ne 0 ]] && [[ "${1}" -ne 256 ]]; then
bashio::log.warning "example 2 crashed, halting add-on"
/run/s6/basedir/bin/halt
fi

s6-svscanctl -t /var/run/s6/services
bashio::log.info "example 2 stoped, restarting..."
3 changes: 1 addition & 2 deletions example/rootfs/etc/services.d/example2/run
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
#!/usr/bin/with-contenv bashio
#!/command/with-contenv bashio
# ==============================================================================
# Home Assistant Community Add-on: Example
# Runs example2 script
# ==============================================================================


bashio::log.info "Starting Example2..."

exec /usr/bin/example2.sh
2 changes: 1 addition & 1 deletion example/rootfs/usr/bin/example1.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/with-contenv bashio
#!/command/with-contenv bashio
# ==============================================================================
# Home Assistant Community Add-on: Example
#
Expand Down
2 changes: 1 addition & 1 deletion example/rootfs/usr/bin/example2.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/with-contenv bashio
#!/command/with-contenv bashio
# ==============================================================================
# Home Assistant Community Add-on: Example
#
Expand Down