From 991981e06dacc816fe30f423ae46c08ab8d853b5 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Thu, 15 Jul 2021 13:03:08 +1200
Subject: [PATCH 1/4] Build docs docker image when certain files change (#1306)

---
 .github/workflows/docker.yml | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 .github/workflows/docker.yml

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
new file mode 100644
index 000000000..6b004eebe
--- /dev/null
+++ b/.github/workflows/docker.yml
@@ -0,0 +1,35 @@
+name: Build Docker image
+
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - current
+    paths:
+      - requirements.txt
+      - Dockerfile
+      - .github/workflows/docker.yml
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      -
+        name: Checkout source code
+        uses: actions/checkout@v2
+      -
+        name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+      -
+        name: Login to DockerHub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKER_USER }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+      -
+        name: Build and push
+        id: docker_build
+        uses: docker/build-push-action@v2
+        with:
+          push: true
+          tags: esphome/esphomedocs:latest

From 9af4d0030ff58e876361a8042f2b18478014e5b7 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Thu, 15 Jul 2021 13:11:57 +1200
Subject: [PATCH 2/4] Fix docker image name Build from checked out files Try
 use latest image as a cache

---
 .github/workflows/docker.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 6b004eebe..57d1d411e 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -31,5 +31,7 @@ jobs:
         id: docker_build
         uses: docker/build-push-action@v2
         with:
+          context: .
           push: true
-          tags: esphome/esphomedocs:latest
+          tags: esphome/esphome-docs:latest
+          cache-from: esphome/esphome-docs:latest

From 42f27b98a28da04a66b3bcd4de5ad9a93760cf66 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Thu, 15 Jul 2021 13:24:36 +1200
Subject: [PATCH 3/4] Explicit action versions Login and push to ghcr too

---
 .github/workflows/docker.yml | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 57d1d411e..8efb27b75 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -16,22 +16,30 @@ jobs:
     steps:
       -
         name: Checkout source code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v2.3.4
       -
         name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v1.5.1
       -
         name: Login to DockerHub
-        uses: docker/login-action@v1
+        uses: docker/login-action@v1.10.0
         with:
           username: ${{ secrets.DOCKER_USER }}
           password: ${{ secrets.DOCKER_PASSWORD }}
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v1.10.0
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
       -
         name: Build and push
         id: docker_build
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v2.6.1
         with:
           context: .
           push: true
-          tags: esphome/esphome-docs:latest
-          cache-from: esphome/esphome-docs:latest
+          tags: |
+            esphome/esphome-docs:latest
+            ghcr.io/esphome/esphome-docs:latest
+          cache-from: ghcr.io/esphome/esphome-docs:latest

From 447e67346d9d7d18ff36fa64d589463eeab3ef7c Mon Sep 17 00:00:00 2001
From: Peter van Dijk <peter@7bits.nl>
Date: Thu, 15 Jul 2021 03:30:16 +0200
Subject: [PATCH 4/4] Remove note about logging on ESP8266 (#1292)

---
 components/sensor/custom.rst | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/components/sensor/custom.rst b/components/sensor/custom.rst
index a0fdc92f4..7e26b97d0 100644
--- a/components/sensor/custom.rst
+++ b/components/sensor/custom.rst
@@ -433,16 +433,6 @@ functions for this.
 
 See :ref:`display-printf` for learning about how to use formatting in log strings.
 
-.. note::
-
-    On ESP8266s you need to disable storing strings in flash to use logging in custom code.
-
-    .. code-block:: yaml
-
-        logger:
-          level: DEBUG
-          esp8266_store_log_strings_in_flash: False
-
 See Also
 --------