From fa3404920a03ca378bc58221198322fdbdf0a3dc Mon Sep 17 00:00:00 2001
From: Jarred Sumner <709451+Jarred-Sumner@users.noreply.github.com>
Date: Wed, 27 Jul 2022 18:03:09 -0700
Subject: [PATCH] Upgrade WebKit in Dockerfile

---
 Dockerfile        | 17 ++++++++---------
 src/bun.js/WebKit |  2 +-
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index aae547a6e2..e25f88fa5b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,6 +9,8 @@ ARG CPU_TARGET=native
 ARG ARCH=x86_64
 ARG TRIPLET=${ARCH}-linux-gnu
 ARG BUILDARCH=amd64
+ARG WEBKIT_URL=https://github.com/oven-sh/WebKit/releases/download/jul27/bun-webkit-linux-${BUILDARCH}.tar.gz 
+ARG ZIG_URL=https://github.com/oven-sh/zig/releases/download/jul1/zig-linux-${BUILDARCH}.zip
 
 FROM bitnami/minideb:bullseye as bun-base
 
@@ -68,18 +70,15 @@ FROM bun-base as bun-base-with-zig-and-webkit
 
 WORKDIR $GITHUB_WORKSPACE
 
-RUN  curl -o zig-linux-$BUILDARCH.zip -L https://github.com/oven-sh/zig/releases/download/jul1/zig-linux-$BUILDARCH.zip && \
+RUN curl -o zig-linux-$BUILDARCH.zip -L ${ZIG_URL} && \
     unzip -q zig-linux-$BUILDARCH.zip && \
     rm zig-linux-$BUILDARCH.zip;
 
-RUN mkdir -p $WEBKIT_OUT_DIR && cd $WEBKIT_OUT_DIR && cd ../ && \
-    curl -o bun-webkit-linux-$BUILDARCH.tar.gz -L https://github.com/oven-sh/WebKit/releases/download/jul4-2/bun-webkit-linux-$BUILDARCH.tar.gz && \
-    gunzip bun-webkit-linux-$BUILDARCH.tar.gz && \
-    tar -xf bun-webkit-linux-$BUILDARCH.tar && \
-    ls && \
-    echo $(pwd) && \
-    rm bun-webkit-linux-$BUILDARCH.tar && \
-    cat $WEBKIT_OUT_DIR/include/cmakeconfig.h > /dev/null
+
+ADD ${WEBKIT_URL} ${GITHUB_WORKSPACE}
+
+# Sanity check
+RUN cat $WEBKIT_OUT_DIR/include/cmakeconfig.h > /dev/null
 
 LABEL org.opencontainers.image.title="bun base image with zig & webkit ${BUILDARCH} (glibc)"
 LABEL org.opencontainers.image.source=https://github.com/jarred-sumner/bun
diff --git a/src/bun.js/WebKit b/src/bun.js/WebKit
index 12eb246335..17d7397d3e 160000
--- a/src/bun.js/WebKit
+++ b/src/bun.js/WebKit
@@ -1 +1 @@
-Subproject commit 12eb2463357d85ee57a57db02dc86062b4c758f1
+Subproject commit 17d7397d3e1183e6004e5931525e9a26cd477a93