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 c6b59fcb9..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.3.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 index 907ecb08c..0036c0289 100644 Binary files a/_static/changelog-2023.12.0.png 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 index b8544e42f..cac537ab6 100644 Binary files a/_static/changelog-2024.2.0.png 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 451d5cb4b..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; } diff --git a/_static/version b/_static/version index c209704ee..af96240eb 100644 --- a/_static/version +++ b/_static/version @@ -1 +1 @@ -2024.3.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 %} diff --git a/schema_doc.py b/schema_doc.py index 36655981a..21042f584 100644 --- a/schema_doc.py +++ b/schema_doc.py @@ -85,6 +85,7 @@ PLATFORMS_TITLES = { "Microphone": "microphone", "Speaker": "speaker", "Alarm Control Panel": "alarm_control_panel", + "Event": "event", } CUSTOM_DOCS = { diff --git a/web-api/index.rst b/web-api/index.rst index 026c7bda6..96e6f793a 100644 --- a/web-api/index.rst +++ b/web-api/index.rst @@ -182,7 +182,7 @@ creating a POST request at ``/light//turn_on?brightness=128&transition=2`` w - **flash**: Flash the color provided by the other properties for a duration in seconds. - **transition**: Transition to the specified color values in this duration in seconds. - **effect**: Set an effect for the light. -- ***color_temp***: Set the color temperature of the light, in mireds. +- **color_temp**: Set the color temperature of the light, in mireds. ``turn_off`` optional URL parameters: @@ -239,9 +239,10 @@ stopped midway. An example GET request for ``/cover/front_window_blinds`` might - **id**: The ID of the cover, prefixed with ``cover-``. - **state**: ``OPEN`` or ``CLOSED``. Any position other than 0.0 is considered open. -- **value**: Current cover position as a float number. +- **value**: Current cover position as a float number. If the cover component does not support cover position reporting, then this will either be 1.0 when open or 0.0 when closed. - **current_operation**: ``OPENING``, ``CLOSING`` or ``IDLE``. - **tilt**: (only if supported by this cover component) tilt angle from 0.0 to 1.0. +- **position**: (only if supported by this cover component) Current cover position as a float number. POST requests on the other hand allow performing actions on the cover, the available methods being ``open``, ``close``, ``stop``, ``toggle`` and ``set``. The following parameters