aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Jarred Sumner <709451+Jarred-Sumner@users.noreply.github.com> 2022-07-27 18:11:13 -0700
committerGravatar Jarred Sumner <709451+Jarred-Sumner@users.noreply.github.com> 2022-07-27 18:11:13 -0700
commited56c1350efa213a6c39d48bb78e8a4ec48b1b75 (patch)
treeeccf23096eb002b697a54773763213ad9300d940
parent0c6512cd33ebca482bc9c2bf7804f35f18741bc3 (diff)
downloadbun-ed56c1350efa213a6c39d48bb78e8a4ec48b1b75.tar.gz
bun-ed56c1350efa213a6c39d48bb78e8a4ec48b1b75.tar.zst
bun-ed56c1350efa213a6c39d48bb78e8a4ec48b1b75.zip
[docker] wip
-rw-r--r--Dockerfile12
1 files changed, 6 insertions, 6 deletions
diff --git a/Dockerfile b/Dockerfile
index 0971f0b42..53d2358d1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,8 +9,10 @@ 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"
+ARG WEBKIT_TAG=jul26
+ARG ZIG_TAG=jul1
+ARG WEBKIT_URL="https://github.com/oven-sh/WebKit/releases/download/$WEBKIT_TAG/bun-webkit-linux-$BUILDARCH.tar.gz"
+ARG ZIG_URL="https://github.com/oven-sh/zig/releases/download/$ZIG_TAG/zig-linux-$BUILDARCH.zip"
FROM bitnami/minideb:bullseye as bun-base
@@ -48,14 +50,14 @@ RUN curl -fsSL https://deb.nodesource.com/setup_lts.x | bash - && \
ARG DEBIAN_FRONTEND
ARG GITHUB_WORKSPACE
-
-# Directory extracts to "bun-webkit"
ARG WEBKIT_DIR
ARG BUN_RELEASE_DIR
ARG BUN_DEPS_OUT_DIR
ARG BUN_DIR
ARG BUILDARCH
ARG ZIG_PATH
+ARG WEBKIT_URL
+ARG ZIG_URL
ENV WEBKIT_OUT_DIR=${WEBKIT_DIR}
ENV BUILDARCH=${BUILDARCH}
@@ -70,8 +72,6 @@ FROM bun-base as bun-base-with-zig-and-webkit
WORKDIR $GITHUB_WORKSPACE
-ARG WEBKIT_URL
-ARG ZIG_URL
RUN curl -o zig-linux-$BUILDARCH.zip -L $ZIG_URL && \
unzip -q zig-linux-$BUILDARCH.zip && \