Account for Wattsi switching to GHCR

Follows whatwg/wattsi@59c6e78.

Author: domenic

Dockerfile

@@ -3,7 +3,7 @@ RUN apt-get update && \
     apt-get install --yes --no-install-recommends ca-certificates curl git python3 python3-pip && \
     rm -rf /var/lib/apt/lists/*
 
-COPY --from=whatwg/wattsi:latest /whatwg/wattsi/bin/wattsi /bin/wattsi
+COPY --from=ghcr.io/whatwg/wattsi:latest /whatwg/wattsi/bin/wattsi /bin/wattsi
 
 RUN pip3 install bs-highlighter
 

README.md

@@ -22,7 +22,7 @@ To build locally, you'll need the following commands installed on your system:
 
 - `curl`, `grep`, `perl`, `unzip`
 
-Optionally, for faster builds, you can install [Wattsi](https://github.com/whatwg/wattsi) and Python 3.7+ (necessary for applying syntax highlighting to `pre` contents). If you don't bother with that, the build will use [Wattsi Server](https://github.com/domenic/wattsi-server), which requires an internet connection.
+Optionally, for faster builds, you can install [Wattsi](https://github.com/whatwg/wattsi) and Python 3.7+ (necessary for applying syntax highlighting to `pre` contents). If you don't bother with that, the build will use [Wattsi Server](https://github.com/whatwg/build.whatwg.org), which requires an internet connection.
 
 ### Running the build
 

build.sh

@@ -10,7 +10,7 @@ DIR=$(pwd)
 # The latest required version of Wattsi. Update this if you change how ./build.sh invokes Wattsi;
 # it will cause a warning if Wattsi's self-reported version is lower. Note that there's no need to
 # update this on every revision of Wattsi; only do so when a warning is justified.
-WATTSI_LATEST=108
+WATTSI_LATEST=136
 
 # Shared state variables throughout this script
 LOCAL_WATTSI=true
@@ -439,12 +439,12 @@ function relativePath {
 # Arguments: none
 # Output: A web server with the build output will be running inside the Docker container
 function doDockerBuild {
-  # Ensure whatwg/wattsi:latest is up to date. Without this, the locally cached copy would be used,
-  # i.e. once Wattsi was downloaded once, it would never update. Note that this is fast
+  # Ensure ghcr.io/whatwg/wattsi:latest is up to date. Without this, the locally cached copy would
+  # be used, i.e. once Wattsi was downloaded once, it would never update. Note that this is fast
   # (zero-transfer) if the locally cached copy is already up to date.
   DOCKER_PULL_ARGS=()
   $QUIET && DOCKER_PULL_ARGS+=( --quiet )
-  DOCKER_PULL_ARGS+=( whatwg/wattsi:latest )
+  DOCKER_PULL_ARGS+=( ghcr.io/whatwg/wattsi:latest )
   docker pull "${DOCKER_PULL_ARGS[@]}"
 
   DOCKER_BUILD_ARGS=( --tag whatwg-html )

ci-build/Dockerfile

@@ -15,7 +15,7 @@ RUN apt-get update && \
 # - Highlighter
 # - fonts, for when Prince renders to PDF
 
-COPY --from=whatwg/wattsi:latest /whatwg/wattsi/bin/wattsi /bin/wattsi
+COPY --from=ghcr.io/whatwg/wattsi:latest /whatwg/wattsi/bin/wattsi /bin/wattsi
 RUN pip3 install bs-highlighter
 
 # The DockerHub container for the validator only contains the server version, so we get the .jar

ci-build/docker-build.sh

@@ -26,7 +26,7 @@ function main {
 
   # Build the Docker image, using Docker Hub as a cache. (This will be fast if nothing has changed
   # in html-build or its dependencies).
-  docker pull whatwg/wattsi
+  docker pull ghcr.io/whatwg/wattsi
   docker pull "$docker_hub_repo" || true
   docker build --cache-from "$docker_hub_repo" --tag "$docker_hub_repo" .
 }