Merge pull request #917 from nhooyr/docker-arm64-playwright-e161

Add playwright deps to arm64 docker image

ci/release/aws/ensure.sh

@@ -332,10 +332,25 @@ sudo groupadd docker || true
 sudo usermod -aG docker \$USER
 
 printf %s '$CI_DOCKER_TOKEN' | docker login -u terrastruct --password-stdin
-# For building images cross platform.
+
-sudo -E apt-get install -y qemu qemu-user-static
+# For building images cross platform from the arm64 instance.
-if docker buildx ls | grep -q 'default \*'; then
+# We could use QEMU with:
-  docker buildx create --use
+#  sudo -E apt-get install -y qemu qemu-user-static
+# But we don't as playwright dependencies do not install on QEMU on either arm64 or amd64.
+if [ "\$(uname -m)" = aarch64 ]; then
+  if [ "\$(stat -c '%a' ~/.ssh/id_ed25519 2>/dev/null)" != 600 ]; then
+    echo '$CI_TSTRUCT_ID_ED25519' >~/.ssh/id_ed25519
+    chmod 600 ~/.ssh/id_ed25519
+  fi
+  if ! docker context ls | grep -qF ci-d2-linux-amd64; then
+    docker context create ci-d2-linux-amd64 --docker "host=ssh://$CI_D2_LINUX_AMD64"
+  fi
+  if ! docker buildx ls | grep -qF 'd2 *'; then
+    docker buildx create --use --name d2 default
+  fi
+  if ! docker buildx inspect d2 | grep -qF ci-d2-linux-amd64; then
+    docker buildx create --append --name d2 ci-d2-linux-amd64
+  fi
 fi
 
 mkdir -p \$HOME/.local/bin

ci/release/build.sh

@@ -263,12 +263,12 @@ build_docker() {
     return 0
   fi
 
-  sh_c lockfile_ssh "$CI_D2_LINUX_AMD64" .d2-build-lock
+  sh_c lockfile_ssh "$CI_D2_LINUX_ARM64" .d2-build-lock
-  sh_c gitsync "$CI_D2_LINUX_AMD64" src/d2
+  sh_c gitsync "$CI_D2_LINUX_ARM64" src/d2
   sh_c rsync --archive --human-readable \
     "$BUILD_DIR/d2-$VERSION"-linux-*.tar.gz \
-    "$CI_D2_LINUX_AMD64:src/d2/$BUILD_DIR/"
+    "$CI_D2_LINUX_ARM64:src/d2/$BUILD_DIR/"
-  sh_c ssh "$CI_D2_LINUX_AMD64" \
+  sh_c ssh "$CI_D2_LINUX_ARM64" \
     "D2_DOCKER_IMAGE=${D2_DOCKER_IMAGE-}" \
     "RELEASE=${RELEASE-}" \
     ./src/d2/ci/release/docker/build.sh \

ci/release/changelogs/next.md

@@ -3,12 +3,14 @@
 - PDF exports are now supported. [#120](https://github.com/terrastruct/d2/issues/120)
 - Diagram background can be styled. [#910](https://github.com/terrastruct/d2/issues/910)
 - 3D Hexagons are now supported. [#869](https://github.com/terrastruct/d2/issues/869)
+- The arm64 docker container now supports rendering diagrams to pngs. [#917](https://github.com/terrastruct/d2/pull/917)
 
 #### Improvements 🧹
 
 - `near` key set to sequence diagram children get an appropriate error message. [#899](https://github.com/terrastruct/d2/issues/899)
 - `class` and `sql_table` shape respect `font-color` styling as header font color. [#899](https://github.com/terrastruct/d2/issues/899)
 - SVG fits to screen by default in both watch mode and as a standalone SVG (this time with just CSS, no JS). [#725](https://github.com/terrastruct/d2/issues/725)
+- Only chromium is installed when rendering png diagrams instead of also installing webkit and firefox. [#835](https://github.com/terrastruct/d2/issues/835)
 
 #### Bugfixes ⛑️
 

ci/release/docker/Dockerfile

@@ -7,9 +7,8 @@ RUN apt-get update && apt-get install -y ca-certificates curl dumb-init sudo
 
 RUN curl -fsSL https://deb.nodesource.com/setup_19.x | bash -s - && \
   apt-get install -y nodejs
-# https://github.com/microsoft/playwright/issues/18319
+# See https://github.com/microsoft/playwright/issues/18319
-# Hopefully soon.
+RUN npx playwright@1.31.1 install-deps chromium
-RUN if [ "$TARGETARCH" = amd64 ]; then npx playwright install-deps; fi
 
 RUN adduser --gecos '' --disabled-password debian \
   && echo "debian ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers.d/nopasswd
@@ -28,7 +27,7 @@ RUN mkdir -p /usr/local/lib/d2 \
       && rm -Rf /tmp/d2-*-linux-"$TARGETARCH".tar.gz
 
 USER debian:debian
-RUN if [ "$TARGETARCH" = amd64 ]; then d2 init-playwright; fi
+RUN d2 init-playwright
 
 WORKDIR /home/debian/src
 EXPOSE 8080

lib/png/png.go

@@ -56,7 +56,10 @@ func startPlaywright(pw *playwright.Playwright) (Playwright, error) {
 }
 
 func InitPlaywright() (Playwright, error) {
-	err := playwright.Install(&playwright.RunOptions{Verbose: false})
+	err := playwright.Install(&playwright.RunOptions{
+		Verbose:  false,
+		Browsers: []string{"chromium"},
+	})
 	if err != nil {
 		return Playwright{}, fmt.Errorf("failed to install Playwright: %w", err)
 	}