diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index c718fde..594f5bc 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -16,16 +16,16 @@ jobs: matrix: app: [nodered, homebridge, mosquitto] steps: - - uses: actions/checkout@v3 - - uses: docker/setup-qemu-action@v1 - - uses: docker/setup-buildx-action@v1 - - uses: docker/login-action@v1 + - uses: actions/checkout@v4 + - uses: docker/setup-qemu-action@v3 + - uses: docker/setup-buildx-action@v3 + - uses: docker/login-action@v3 with: registry: ghcr.io username: $GITHUB_ACTOR password: ${{ secrets.DOCKER_TOKEN }} - name: Build and push - uses: docker/build-push-action@v2 + uses: docker/build-push-action@v5 with: context: ${{ matrix.app }} platforms: linux/amd64,linux/arm64,linux/arm/v7 diff --git a/homebridge/Dockerfile b/homebridge/Dockerfile index c907927..be8b964 100644 --- a/homebridge/Dockerfile +++ b/homebridge/Dockerfile @@ -1,8 +1,8 @@ -FROM alpine +FROM alpine:3.18 RUN apk add --no-cache --virtual .build-deps make gcc g++ python3 \ && apk add --no-cache nodejs npm openssl avahi-compat-libdns_sd avahi-dev dbus -RUN npm i -g homebridge homebridge-mqtt \ +RUN npm i -g homebridge homebridge-mqtt homebridge-config-ui-x \ && apk del .build-deps RUN apk add --no-cache dumb-init tzdata @@ -15,6 +15,6 @@ COPY entrypoint.sh . VOLUME ./.homebridge -EXPOSE 5353 51826 +EXPOSE 5353 8581 51826 ENTRYPOINT ["/root/entrypoint.sh"] -CMD ["dumb-init", "homebridge", "-U", "/root/.homebridge"] +CMD ["dumb-init", "hb-service", "run", "--allow-root", "-U", "/root/.homebridge"] diff --git a/homebridge/config/config.json b/homebridge/config/config.json index 962b077..e7166eb 100644 --- a/homebridge/config/config.json +++ b/homebridge/config/config.json @@ -8,6 +8,12 @@ "description": "This is an example configuration file with one fake accessory and one fake platform. You can use this as a template for creating your own configuration file containing devices you actually own.", "accessories": [], "platforms": [ + { + "platform": "config", + "name": "Config", + "port": 8581, + "sudo": false + }, { "platform": "mqtt", "name": "mqtt", diff --git a/mosquitto/Dockerfile b/mosquitto/Dockerfile index 8c42a59..a840442 100644 --- a/mosquitto/Dockerfile +++ b/mosquitto/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine +FROM alpine:3.18 RUN apk add --no-cache mosquitto mosquitto-clients tzdata diff --git a/nodered/Dockerfile b/nodered/Dockerfile index 2b06bdd..2c1876d 100644 --- a/nodered/Dockerfile +++ b/nodered/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine +FROM alpine:3.18 RUN apk add --no-cache --virtual .build-deps make gcc g++ python3 krb5-dev zeromq-dev \ && apk add --no-cache nodejs npm openssl