From 849a98d5b4e93ba61cd323cd224d46774d3566bc Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Mon, 1 Jul 2024 08:54:04 +1200
Subject: [PATCH 1/4] Bump dockerfile dependencies (#7017)

---
 docker/Dockerfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index fcb5a5e7ae..eabd118939 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -34,7 +34,7 @@ RUN \
         python3-wheel=0.38.4-2 \
         iputils-ping=3:20221126-1 \
         git=1:2.39.2-1.1 \
-        curl=7.88.1-10+deb12u5 \
+        curl=7.88.1-10+deb12u6 \
         openssh-client=1:9.2p1-2+deb12u2 \
         python3-cffi=1.15.1-5 \
         libcairo2=1.16.0-7 \
@@ -190,8 +190,8 @@ RUN \
         clang-format-13=1:13.0.1-11+b2 \
         clang-tidy-14=1:14.0.6-12 \
         patch=2.7.6-7 \
-        software-properties-common=0.99.30-4 \
-        nano=7.2-1 \
+        software-properties-common=0.99.30-4.1~deb12u1 \
+        nano=7.2-1+deb12u1 \
         build-essential=12.9 \
         python3-dev=3.11.2-1+b1 \
     && rm -rf \

From c013c3bf6194ab257c108ef66b27af18939bcf5f Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Mon, 1 Jul 2024 11:17:44 +1200
Subject: [PATCH 2/4] [docker] Bump versions inside armv7 block (#7022)

---
 docker/Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index eabd118939..b0c800f167 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -46,8 +46,8 @@ RUN \
           python3-dev=3.11.2-1+b1 \
           zlib1g-dev=1:1.2.13.dfsg-1 \
           libjpeg-dev=1:2.1.5-2 \
-          libfreetype-dev=2.12.1+dfsg-5 \
-          libssl-dev=3.0.11-1~deb12u2 \
+          libfreetype-dev=2.12.1+dfsg-5+deb12u3 \
+          libssl-dev=3.0.13-1~deb12u1 \
           libffi-dev=3.4.4-1 \
           libopenjp2-7=2.5.0-2 \
           libtiff6=4.5.0-6+deb12u1 \

From fc3f806555eb395452c0526b3e9cf1503fdcee51 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Mon, 1 Jul 2024 11:51:51 +1200
Subject: [PATCH 3/4] [docker] Fix docker build error fall through (#7021)

---
 docker/Dockerfile | 38 +++++++++++++++++++++-----------------
 1 file changed, 21 insertions(+), 17 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index b0c800f167..16f37274c6 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -39,23 +39,27 @@ RUN \
         python3-cffi=1.15.1-5 \
         libcairo2=1.16.0-7 \
         libmagic1=1:5.44-3 \
-        patch=2.7.6-7; \
-    if [ "$TARGETARCH$TARGETVARIANT" = "armv7" ]; then \
-        apt-get install -y --no-install-recommends \
-          build-essential=12.9 \
-          python3-dev=3.11.2-1+b1 \
-          zlib1g-dev=1:1.2.13.dfsg-1 \
-          libjpeg-dev=1:2.1.5-2 \
-          libfreetype-dev=2.12.1+dfsg-5+deb12u3 \
-          libssl-dev=3.0.13-1~deb12u1 \
-          libffi-dev=3.4.4-1 \
-          libopenjp2-7=2.5.0-2 \
-          libtiff6=4.5.0-6+deb12u1 \
-          cargo=0.66.0+ds1-1 \
-          pkg-config=1.8.1-1 \
-          gcc-arm-linux-gnueabihf=4:12.2.0-3; \
-    fi; \
-    rm -rf \
+        patch=2.7.6-7 \
+    && ( \
+        ( \
+            [ "$TARGETARCH$TARGETVARIANT" = "armv7" ] && \
+                apt-get install -y --no-install-recommends \
+                build-essential=12.9 \
+                python3-dev=3.11.2-1+b1 \
+                zlib1g-dev=1:1.2.13.dfsg-1 \
+                libjpeg-dev=1:2.1.5-2 \
+                libfreetype-dev=2.12.1+dfsg-5+deb12u3 \
+                libssl-dev=3.0.13-1~deb12u1 \
+                libffi-dev=3.4.4-1 \
+                libopenjp2-7=2.5.0-2 \
+                libtiff6=4.5.0-6+deb12u1 \
+                cargo=0.66.0+ds1-1 \
+                pkg-config=1.8.1-1 \
+                gcc-arm-linux-gnueabihf=4:12.2.0-3 \
+        ) \
+        || [ "$TARGETARCH$TARGETVARIANT" != "armv7" ] \
+    ) \
+    && rm -rf \
         /tmp/* \
         /var/{cache,log}/* \
         /var/lib/apt/lists/*

From 3727342bce096a38d6f3d20d00aa89e7295c8c89 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Wed, 3 Jul 2024 20:14:27 +1200
Subject: [PATCH 4/4] Bump version to 2024.6.6

---
 esphome/const.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/esphome/const.py b/esphome/const.py
index 5b441faa6c..0d79908226 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -1,6 +1,6 @@
 """Constants used by esphome."""
 
-__version__ = "2024.6.5"
+__version__ = "2024.6.6"
 
 ALLOWED_NAME_CHARS = "abcdefghijklmnopqrstuvwxyz0123456789-_"
 VALID_SUBSTITUTIONS_CHARACTERS = (