diff --git a/babybuddy/Dockerfile b/babybuddy/Dockerfile index f474059..9f78e41 100644 --- a/babybuddy/Dockerfile +++ b/babybuddy/Dockerfile @@ -1,4 +1,4 @@ -ARG BUILD_FROM=ghcr.io/hassio-addons/base:14.0.7 +ARG BUILD_FROM=ghcr.io/hassio-addons/base:14.1.1 # hadolint ignore=DL3006 FROM ${BUILD_FROM} @@ -20,6 +20,7 @@ RUN \ # hadolint ignore=DL3003 RUN \ echo "**** install build packages ****" && \ + apk add --no-cache rust cargo && \ apk add --no-cache --virtual=build-dependencies \ build-base \ curl \ diff --git a/babybuddy/build.yaml b/babybuddy/build.yaml index 1d1cceb..1a54526 100644 --- a/babybuddy/build.yaml +++ b/babybuddy/build.yaml @@ -1,7 +1,7 @@ --- build_from: - aarch64: ghcr.io/hassio-addons/base:14.0.7 - amd64: ghcr.io/hassio-addons/base:14.0.7 - armhf: ghcr.io/hassio-addons/base:14.0.7 - armv7: ghcr.io/hassio-addons/base:14.0.7 - i386: ghcr.io/hassio-addons/base:14.0.7 + aarch64: ghcr.io/hassio-addons/base:14.1.1 + amd64: ghcr.io/hassio-addons/base:14.1.1 + armhf: ghcr.io/hassio-addons/base:14.1.1 + armv7: ghcr.io/hassio-addons/base:14.1.1 + i386: ghcr.io/hassio-addons/base:14.1.1 diff --git a/babybuddy/config.yaml b/babybuddy/config.yaml index fea9349..524dec7 100755 --- a/babybuddy/config.yaml +++ b/babybuddy/config.yaml @@ -1,6 +1,6 @@ --- name: Baby Buddy -version: 2.0.4 +version: 2.0.4.1 homeassistant: 2023.6.2 slug: baby_buddy image: "ottpeterr/image-{arch}-babybuddy" @@ -20,12 +20,10 @@ ingress_stream: false panel_admin: false options: CSRF_TRUSTED_ORIGINS: "" - USE_24_HOUR_TIME_FORMAT: False INGRESS_USER: "" log_level: info schema: CSRF_TRUSTED_ORIGINS: str - USE_24_HOUR_TIME_FORMAT: bool INGRESS_USER: str log_level: list(debug|info|warning|error|critical) ports: diff --git a/babybuddy/root/etc/services.d/babybuddy/run b/babybuddy/root/etc/services.d/babybuddy/run index a0d4160..5dfba22 100755 --- a/babybuddy/root/etc/services.d/babybuddy/run +++ b/babybuddy/root/etc/services.d/babybuddy/run @@ -19,11 +19,10 @@ export \ TIME_ZONE="${TZ:-UTC}" \ DEBUG="${DEBUG:-False}" \ ENABLE_HOME_ASSISTANT_SUPPORT=true \ - SECRET_KEY="${SECRET_KEY:-`cat /config/.secretkey`}" + SECRET_KEY="${SECRET_KEY:-$(cat /config/.secretkey)}" export \ - CSRF_TRUSTED_ORIGINS=$(bashio::config "CSRF_TRUSTED_ORIGINS") \ - USE_24_HOUR_TIME_FORMAT=$(bashio::config "USE_24_HOUR_TIME_FORMAT") + CSRF_TRUSTED_ORIGINS=$(bashio::config "CSRF_TRUSTED_ORIGINS") if bashio::config.has_value "INGRESS_USER"; then bashio::log.info 'Adding config for Ingress User Auth'