aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Jarred Sumner <709451+Jarred-Sumner@users.noreply.github.com> 2022-10-17 22:39:49 -0700
committerGravatar Jarred Sumner <709451+Jarred-Sumner@users.noreply.github.com> 2022-10-17 22:39:49 -0700
commitabd6e496aba35a78c1fd88cb8a04990ec9f810c8 (patch)
tree4296335f91e8c44c617f7a787261292887f89134
parent8e1b2ba32e1eecb26ec8f21628207890fab34c14 (diff)
downloadbun-abd6e496aba35a78c1fd88cb8a04990ec9f810c8.tar.gz
bun-abd6e496aba35a78c1fd88cb8a04990ec9f810c8.tar.zst
bun-abd6e496aba35a78c1fd88cb8a04990ec9f810c8.zip
Add oniguruma to Dockerfile
CC @dylan-conway so you have context in the future how to do this
-rw-r--r--Dockerfile21
1 files changed, 20 insertions, 1 deletions
diff --git a/Dockerfile b/Dockerfile
index 5d799e841..f081d34ad 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -183,8 +183,26 @@ RUN install_packages autoconf automake libtool pkg-config
COPY Makefile ${BUN_DIR}/Makefile
COPY src/deps/libarchive ${BUN_DIR}/src/deps/libarchive
+FROM bun-base as oniguruma
+
+ARG DEBIAN_FRONTEND
+ARG GITHUB_WORKSPACE
+ARG ZIG_PATH
+# Directory extracts to "bun-webkit"
+ARG WEBKIT_DIR
+ARG BUN_RELEASE_DIR
+ARG BUN_DEPS_OUT_DIR
+ARG BUN_DIR
+ARG CPU_TARGET
+ENV CPU_TARGET=${CPU_TARGET}
+
+RUN install_packages autoconf automake libtool pkg-config
+
+COPY Makefile ${BUN_DIR}/Makefile
+COPY src/deps/oniguruma ${BUN_DIR}/src/deps/oniguruma
+
WORKDIR $BUN_DIR
-RUN make libarchive && rm -rf src/deps/libarchive Makefile
+RUN make oniguruma && rm -rf src/deps/oniguruma Makefile
FROM bun-base as tinycc
@@ -459,6 +477,7 @@ ENV LIB_ICU_PATH=${WEBKIT_DIR}/lib
COPY --from=lolhtml ${BUN_DEPS_OUT_DIR}/*.a ${BUN_DEPS_OUT_DIR}/
COPY --from=mimalloc ${BUN_DEPS_OUT_DIR}/*.o ${BUN_DEPS_OUT_DIR}/
COPY --from=libarchive ${BUN_DEPS_OUT_DIR}/*.a ${BUN_DEPS_OUT_DIR}/
+COPY --from=oniguruma ${BUN_DEPS_OUT_DIR}/*.a ${BUN_DEPS_OUT_DIR}/
COPY --from=picohttp ${BUN_DEPS_OUT_DIR}/*.o ${BUN_DEPS_OUT_DIR}/
COPY --from=boringssl ${BUN_DEPS_OUT_DIR}/*.a ${BUN_DEPS_OUT_DIR}/
COPY --from=uws ${BUN_DEPS_OUT_DIR}/*.a ${BUN_DEPS_OUT_DIR}/