From 06c550734809cfb5caf1f6f8ff70439c7c824f66 Mon Sep 17 00:00:00 2001
From: Peter Ott <3091463+OttPeterR@users.noreply.github.com>
Date: Mon, 9 Oct 2023 00:27:01 +0000
Subject: [PATCH 1/3] base to 4.2.1 and BB to 2.1.0

---
 babybuddy/Dockerfile  |  4 ++--
 babybuddy/build.yaml  | 10 +++++-----
 babybuddy/config.yaml |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/babybuddy/Dockerfile b/babybuddy/Dockerfile
index 9f78e41..9625236 100644
--- a/babybuddy/Dockerfile
+++ b/babybuddy/Dockerfile
@@ -1,4 +1,4 @@
-ARG BUILD_FROM=ghcr.io/hassio-addons/base:14.1.1
+ARG BUILD_FROM=ghcr.io/hassio-addons/base:14.2.1
 # hadolint ignore=DL3006
 FROM ${BUILD_FROM}
 
@@ -11,7 +11,7 @@ RUN \
   echo "**** downloading babybuddy ****" && \
   curl -o \
   /tmp/babybuddy.tar.gz -L \
-  "https://github.com/babybuddy/babybuddy/archive/refs/tags/v2.0.4.tar.gz" && \
+  "https://github.com/babybuddy/babybuddy/archive/refs/tags/v2.1.0.tar.gz" && \
   mkdir -p /app/babybuddy && \
   tar xf \
   /tmp/babybuddy.tar.gz -C \
diff --git a/babybuddy/build.yaml b/babybuddy/build.yaml
index 1a54526..3213b28 100644
--- a/babybuddy/build.yaml
+++ b/babybuddy/build.yaml
@@ -1,7 +1,7 @@
 ---
 build_from:
-  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
+  aarch64: ghcr.io/hassio-addons/base:14.2.1
+  amd64: ghcr.io/hassio-addons/base:14.2.1
+  armhf: ghcr.io/hassio-addons/base:14.2.1
+  armv7: ghcr.io/hassio-addons/base:14.2.1
+  i386: ghcr.io/hassio-addons/base:14.2.1
diff --git a/babybuddy/config.yaml b/babybuddy/config.yaml
index 524dec7..6d11555 100755
--- a/babybuddy/config.yaml
+++ b/babybuddy/config.yaml
@@ -1,6 +1,6 @@
 ---
 name: Baby Buddy
-version: 2.0.4.1
+version: 2.1.0
 homeassistant: 2023.6.2
 slug: baby_buddy
 image: "ottpeterr/image-{arch}-babybuddy"

From 61e028348a55ea799276a3b540fd2441460966bd Mon Sep 17 00:00:00 2001
From: Peter Ott <3091463+OttPeterR@users.noreply.github.com>
Date: Mon, 9 Oct 2023 15:07:34 +0000
Subject: [PATCH 2/3] bump version

---
 babybuddy/Dockerfile  | 2 +-
 babybuddy/config.yaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/babybuddy/Dockerfile b/babybuddy/Dockerfile
index 9625236..cda3999 100644
--- a/babybuddy/Dockerfile
+++ b/babybuddy/Dockerfile
@@ -11,7 +11,7 @@ RUN \
   echo "**** downloading babybuddy ****" && \
   curl -o \
   /tmp/babybuddy.tar.gz -L \
-  "https://github.com/babybuddy/babybuddy/archive/refs/tags/v2.1.0.tar.gz" && \
+  "https://github.com/babybuddy/babybuddy/archive/refs/tags/v2.1.1.tar.gz" && \
   mkdir -p /app/babybuddy && \
   tar xf \
   /tmp/babybuddy.tar.gz -C \
diff --git a/babybuddy/config.yaml b/babybuddy/config.yaml
index 6d11555..1629c87 100755
--- a/babybuddy/config.yaml
+++ b/babybuddy/config.yaml
@@ -1,6 +1,6 @@
 ---
 name: Baby Buddy
-version: 2.1.0
+version: 2.1.1
 homeassistant: 2023.6.2
 slug: baby_buddy
 image: "ottpeterr/image-{arch}-babybuddy"

From bf789be2e23db648e74493491b9ef3045b42d5c0 Mon Sep 17 00:00:00 2001
From: Peter Ott <3091463+OttPeterR@users.noreply.github.com>
Date: Mon, 9 Oct 2023 16:20:16 +0000
Subject: [PATCH 3/3] move rust deps

---
 babybuddy/Dockerfile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/babybuddy/Dockerfile b/babybuddy/Dockerfile
index cda3999..2d91dbd 100644
--- a/babybuddy/Dockerfile
+++ b/babybuddy/Dockerfile
@@ -20,7 +20,6 @@ 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 \
@@ -46,7 +45,9 @@ RUN \
   py3-mysqlclient \
   py3-pip \
   python3 \
-  nginx
+  nginx \
+  rust \
+  cargo
 
 RUN \
   echo "**** installing ****" && \