diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 56d3ab158..4d946d012 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -21,6 +21,9 @@ jobs: - name: Checkout source code uses: actions/checkout@v4.1.0 + - + name: Set up QEMU + uses: docker/setup-qemu-action@v3 - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 @@ -43,6 +46,7 @@ jobs: with: context: . push: true + platforms: linux/amd64,linux/arm64 tags: | esphome/esphome-docs:latest ghcr.io/esphome/esphome-docs:latest diff --git a/Dockerfile b/Dockerfile index 78290dcf3..a99ffa478 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.8-slim +FROM python:3.12-slim RUN apt-get update && apt-get install -y --no-install-recommends \ curl \ @@ -9,10 +9,25 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ software-properties-common \ && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* -COPY requirements.txt . +RUN useradd -ms /bin/bash esphome + +USER esphome + +WORKDIR /workspaces/esphome-docs +ENV PATH="${PATH}:/home/esphome/.local/bin" + +COPY requirements.txt ./ RUN pip3 install --no-cache-dir --no-binary :all: -r requirements.txt EXPOSE 8000 -WORKDIR /data/esphomedocs CMD ["make", "live-html"] + +LABEL \ + org.opencontainers.image.title="esphome-docs" \ + org.opencontainers.image.description="An image to help with ESPHomes documentation development" \ + org.opencontainers.image.vendor="ESPHome" \ + org.opencontainers.image.licenses="CC BY-NC-SA 4.0" \ + org.opencontainers.image.url="https://esphome.io" \ + org.opencontainers.image.source="https://github.com/esphome/esphome-docs" \ + org.opencontainers.image.documentation="https://github.com/esphome/esphome-docs/blob/current/README.md" diff --git a/Doxygen b/Doxygen index 8c5682359..149e4876c 100644 --- a/Doxygen +++ b/Doxygen @@ -38,7 +38,7 @@ PROJECT_NAME = "ESPHome" # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = 2024.1.0-dev +PROJECT_NUMBER = 2024.4.2 # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer a diff --git a/Makefile b/Makefile index 299496721..5251aa29e 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ ESPHOME_PATH = ../esphome -ESPHOME_REF = dev +ESPHOME_REF = 2024.4.2 .PHONY: html html-strict cleanhtml deploy help live-html Makefile netlify netlify-api api netlify-dependencies svg2png copy-svg2png minify diff --git a/_static/changelog-2023.10.0.png b/_static/changelog-2023.10.0.png index baee40c24..43b79a604 100644 Binary files a/_static/changelog-2023.10.0.png and b/_static/changelog-2023.10.0.png differ diff --git a/_static/changelog-2023.11.0.png b/_static/changelog-2023.11.0.png index ce5858d4e..83b5ab87e 100644 Binary files a/_static/changelog-2023.11.0.png and b/_static/changelog-2023.11.0.png differ diff --git a/_static/changelog-2023.12.0.png b/_static/changelog-2023.12.0.png new file mode 100644 index 000000000..0036c0289 Binary files /dev/null and b/_static/changelog-2023.12.0.png differ diff --git a/_static/changelog-2024.2.0.png b/_static/changelog-2024.2.0.png new file mode 100644 index 000000000..cac537ab6 Binary files /dev/null and b/_static/changelog-2024.2.0.png differ diff --git a/_static/changelog-2024.3.0.png b/_static/changelog-2024.3.0.png new file mode 100644 index 000000000..6d649726b Binary files /dev/null and b/_static/changelog-2024.3.0.png differ diff --git a/_static/changelog-2024.4.0.png b/_static/changelog-2024.4.0.png new file mode 100644 index 000000000..96c8a876e Binary files /dev/null and b/_static/changelog-2024.4.0.png differ diff --git a/_static/custom.css b/_static/custom.css index b442b6a9e..182ffa4ab 100644 --- a/_static/custom.css +++ b/_static/custom.css @@ -240,6 +240,11 @@ a:hover code { background: none; } +/* don't underline links that contain an image and nothing else */ +a:has(> img:only-child) { + border-bottom: none; +} + div.body p, div.body dd, div.body li, div.body blockquote { hyphens: none; } @@ -256,7 +261,7 @@ div.body p, div.body dd, div.body li, div.body blockquote { background: #212121; color: #ececec; } - + } body, div.body { @@ -281,7 +286,7 @@ div.body p, div.body dd, div.body li, div.body blockquote { color: #ececec; background-color: #212121; } - + a, a.reference, a:visited { color: #00bfff; border-bottom: 1px dotted #00bfff; @@ -326,7 +331,7 @@ div.body p, div.body dd, div.body li, div.body blockquote { color: #e2e2e2; } - div.note, div.tip { + div.note, div.tip, div.important { background-color: #2d2c2c; border: 1px solid #808080; } @@ -339,4 +344,4 @@ div.body p, div.body dd, div.body li, div.body blockquote { background-color: #8e8129; } -} \ No newline at end of file +} diff --git a/_static/version b/_static/version index dd273dfb1..af96240eb 100644 --- a/_static/version +++ b/_static/version @@ -1 +1 @@ -2024.1.0-dev \ No newline at end of file +2024.4.2 \ No newline at end of file diff --git a/_templates/layout.html b/_templates/layout.html index c24609924..b11da1a47 100644 --- a/_templates/layout.html +++ b/_templates/layout.html @@ -16,6 +16,7 @@ + @@ -40,7 +41,7 @@ {% block footer %}