Skip to content

Update Dockerfiles #310

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 25, 2025
Merged

Update Dockerfiles #310

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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/
Expand All @@ -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"]
6 changes: 3 additions & 3 deletions ci-build/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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/
Expand All @@ -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
Expand Down
Loading