Skip to content

Commit

Permalink
Remove 24 hour param (#54)
Browse files Browse the repository at this point in the history
* remove 24 hour param

* bump base to 14.0.8

* bump adodn version

* bump base

* install rust

* slash
  • Loading branch information
OttPeterR authored Sep 30, 2023
1 parent 7ecfd12 commit 159cf22
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 12 deletions.
3 changes: 2 additions & 1 deletion babybuddy/Dockerfile
Original file line number Diff line number Diff line change
@@ -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}

Expand All @@ -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 \
Expand Down
10 changes: 5 additions & 5 deletions babybuddy/build.yaml
Original file line number Diff line number Diff line change
@@ -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
4 changes: 1 addition & 3 deletions babybuddy/config.yaml
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -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:
Expand Down
5 changes: 2 additions & 3 deletions babybuddy/root/etc/services.d/babybuddy/run
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down

0 comments on commit 159cf22

Please sign in to comment.