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

Swap base image from alpine to debian #166

Open
wants to merge 10 commits into
base: rc-24.1.2
Choose a base branch
from
Open
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
7 changes: 6 additions & 1 deletion .github/workflows/builder.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,18 @@ on:
tags: [ 'v*.*.*' ]
workflow_dispatch:

permissions:
contents: read
packages: write
id-token: write

jobs:
build:
runs-on: ubuntu-latest
strategy:
matrix:
addon: ["ebusd"]
arch: ["aarch64", "amd64", "armhf", "armv7", "i386"]
arch: ["aarch64", "amd64", "armv7", "i386"]

steps:
- name: ⤵️ Check out code from GitHub
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tester.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
strategy:
matrix:
addon: ["ebusd"]
arch: ["aarch64", "amd64", "armhf", "armv7", "i386"]
arch: ["aarch64", "amd64", "armv7", "i386"]

steps:
- name: ⤵️ Check out code from GitHub
Expand Down
17 changes: 15 additions & 2 deletions ebusd/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,20 @@ FROM $BUILD_FROM

ENV LANG C.UTF-8

RUN apk add --no-cache ebusd=24.1-r0
RUN mkdir -p /etc/apt/keyrings && curl -s -o /etc/apt/keyrings/ebusd.gpg \
https://raw.githubusercontent.com/john30/ebusd-debian/master/ebusd.gpg


RUN curl -s -o /etc/apt/sources.list.d/ebusd.list \
https://raw.githubusercontent.com/john30/ebusd-debian/master/ebusd-default-bookworm.list

RUN apt-get update

RUN apt-get install netcat-traditional ebusd -y

RUN apt-get autoremove -y

RUN apt-get clean

LABEL Description="ebusd"

Expand All @@ -12,5 +25,5 @@ RUN chmod a+x /run.sh
CMD [ "/run.sh" ]

# Health check
HEALTHCHECK --interval=5m --timeout=3s --start-period=90s \
HEALTHCHECK --interval=30s --timeout=3s --start-period=60s \
CMD nc -z 127.0.0.1 8888 || exit 1
9 changes: 4 additions & 5 deletions ebusd/build.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
build_from:
aarch64: "ghcr.io/home-assistant/aarch64-base:3.21"
amd64: "ghcr.io/home-assistant/amd64-base:3.21"
armhf: "ghcr.io/home-assistant/armhf-base:3.21"
armv7: "ghcr.io/home-assistant/armv7-base:3.21"
i386: "ghcr.io/home-assistant/i386-base:3.21"
aarch64: "ghcr.io/home-assistant/aarch64-base-debian:bookworm"
amd64: "ghcr.io/home-assistant/amd64-base-debian:bookworm"
armv7: "ghcr.io/home-assistant/armv7-base-debian:bookworm"
i386: "ghcr.io/home-assistant/i386-base-debian:bookworm"
labels:
org.opencontainers.image.title: "Home Assistant Add-on: Ebusd"
org.opencontainers.image.description: "This Add-on runs eBUSd, a daemon for handling communication with eBUS devices"
Expand Down
4 changes: 2 additions & 2 deletions ebusd/config.yaml
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
name: eBUSd
version: "24.1.1"
version: "24.1.2"
slug: ebusd
description: >
This Add-on runs eBUSd, a daemon for handling communication with eBUS devices
connected to a 2-wire bus system (“energy bus” used by numerous heating systems)
USB and network eBUSd adapters are supported.
url: https://community.home-assistant.io/t/an-ebusd-add-on/344852
arch:
- armhf
- armv7
- aarch64
- amd64
Expand All @@ -20,6 +19,7 @@ services:
uart: true
map:
- config:rw
- ssl:rw
ports:
8888/tcp: null
8889/tcp: null
Expand Down
Loading