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

BB 2.6.2, HA base 16.3.4 #73

Merged
merged 13 commits into from
Nov 6, 2024
5 changes: 5 additions & 0 deletions babybuddy/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# CHANGELOG

## 2.6.2
### :arrow_up: Updated
- Updated to Baby Buddy [2.6.2](https://github.com/babybuddy/babybuddy/releases/tag/v2.6.2)
- Updated add on base to [16.3.4](https://github.com/hassio-addons/addon-base/releases/tag/v16.3.4)

## 2.2.1.1

### :arrow_up: Updated
Expand Down
18 changes: 10 additions & 8 deletions babybuddy/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG BUILD_FROM=ghcr.io/hassio-addons/base:15.0.6
ARG BUILD_FROM=ghcr.io/hassio-addons/base:16.3.4
# hadolint ignore=DL3006
FROM ${BUILD_FROM}

Expand All @@ -11,7 +11,7 @@ RUN \
echo "**** downloading babybuddy ****" && \
curl -o \
/tmp/babybuddy.tar.gz -L \
"https://github.com/babybuddy/babybuddy/archive/refs/tags/v2.2.1.tar.gz" && \
"https://github.com/babybuddy/babybuddy/archive/refs/tags/v2.6.2.tar.gz" && \
mkdir -p /app/babybuddy && \
tar xf \
/tmp/babybuddy.tar.gz -C \
Expand Down Expand Up @@ -49,13 +49,15 @@ RUN \
rust \
cargo

RUN \
echo "**** installing ****" && \
cd /app/babybuddy && \
pip3 install -U --no-cache-dir \
pip && \
pip install -U --ignore-installed -r requirements.txt
# Define PATH_MAX before including necessary headers
RUN echo '#define PATH_MAX 4096' >> /usr/include/limits.h

# Install dependencies
RUN echo "**** installing ****" && \
cd /app/babybuddy && \
pip3 install -U --no-cache-dir pip && \
CFLAGS="-DPATH_MAX=4096" pip install -U --ignore-installed --prefer-binary -r requirements.txt

RUN \
echo "**** cleanup ****" && \
apk del --purge \
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:15.0.6
amd64: ghcr.io/hassio-addons/base:15.0.6
armhf: ghcr.io/hassio-addons/base:15.0.6
armv7: ghcr.io/hassio-addons/base:15.0.6
i386: ghcr.io/hassio-addons/base:15.0.6
aarch64: ghcr.io/hassio-addons/base:16.3.4
amd64: ghcr.io/hassio-addons/base:16.3.4
armhf: ghcr.io/hassio-addons/base:16.3.4
armv7: ghcr.io/hassio-addons/base:16.3.4
i386: ghcr.io/hassio-addons/base:16.3.4
2 changes: 1 addition & 1 deletion babybuddy/config.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
name: Baby Buddy
version: 2.2.1.1
version: 2.6.2
homeassistant: 2023.6.2
slug: baby_buddy
image: "ottpeterr/image-{arch}-babybuddy"
Expand Down
17 changes: 8 additions & 9 deletions babybuddy/root/etc/nginx/templates/ingress.gtpl
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,21 @@ server {
include /etc/nginx/includes/server_params.conf;
include /etc/nginx/includes/proxy_params.conf;

location /media {
root /app/babybuddy;
}

location /static {
root /app/babybuddy;
}

location / {
allow 172.30.32.2;
deny all;

proxy_pass http://backend;

absolute_redirect off;
proxy_redirect '/' $http_x_ingress_path/;
sub_filter 'href="/' 'href="$http_x_ingress_path/';
sub_filter 'href=/>' 'href="$http_x_ingress_path/">'; # Top left home icon
sub_filter 'action="/' 'action="$http_x_ingress_path/';
sub_filter '<script src="/' '<script src="$http_x_ingress_path/';
sub_filter '<img src="/' '<img src="$http_x_ingress_path/';
sub_filter "top.location.href='" "top.location.href='$http_x_ingress_path";

sub_filter_once off;
{{ if .remoteuser }}
proxy_set_header X-Remote-User '{{ .remoteuser }}';
{{- end }}
Expand Down
Loading