From 932565b3d97da7dc4e805a4792b290390183f445 Mon Sep 17 00:00:00 2001 From: Domenic Denicola Date: Thu, 25 Sep 2025 16:28:32 +0900 Subject: [PATCH] Update Dockerfiles This silences a couple warnings and also updates our Rust version (which appears to change nothing important). --- Dockerfile | 8 ++++---- ci-build/Dockerfile | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index 52611947..e24ff163 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM rust:1.88-slim as builder +FROM rust:1.90-slim AS builder WORKDIR /whatwg/html-build COPY Cargo.lock Cargo.toml ./ COPY src ./src/ @@ -13,11 +13,11 @@ COPY --from=builder /usr/local/cargo/bin/html-build /bin/html-build COPY --from=ghcr.io/whatwg/wattsi:latest /whatwg/wattsi/bin/wattsi /bin/wattsi -ENV PIPX_HOME /opt/pipx -ENV PIPX_BIN_DIR /usr/bin +ENV PIPX_HOME=/opt/pipx +ENV PIPX_BIN_DIR=/usr/bin RUN pipx install bs-highlighter COPY . /whatwg/html-build/ -ENV SKIP_BUILD_UPDATE_CHECK true +ENV SKIP_BUILD_UPDATE_CHECK=true ENTRYPOINT ["bash", "/whatwg/html-build/build.sh"] diff --git a/ci-build/Dockerfile b/ci-build/Dockerfile index 4a06e5d1..13534da3 100644 --- a/ci-build/Dockerfile +++ b/ci-build/Dockerfile @@ -1,6 +1,6 @@ # This Dockerfile is just used to run on Travis CI in an environment that can easily and repeatedly # install our build dependencies. -FROM rust:1.88-slim as builder +FROM rust:1.90-slim AS builder WORKDIR /whatwg/html-build COPY Cargo.lock Cargo.toml ./ COPY src ./src/ @@ -27,8 +27,8 @@ COPY --from=builder /usr/local/cargo/bin/html-build /bin/html-build COPY --from=ghcr.io/whatwg/wattsi:latest /whatwg/wattsi/bin/wattsi /bin/wattsi -ENV PIPX_HOME /opt/pipx -ENV PIPX_BIN_DIR /usr/bin +ENV PIPX_HOME=/opt/pipx +ENV PIPX_BIN_DIR=/usr/bin RUN pipx install bs-highlighter # The DockerHub container for the validator only contains the server version, so we get the .jar