diff options
| -rw-r--r-- | Dockerfile | 19 | ||||
| -rw-r--r-- | Dockerfile.base | 1 |
2 files changed, 20 insertions, 0 deletions
diff --git a/Dockerfile b/Dockerfile index b46a8feab..010025b78 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,3 +1,21 @@ + +FROM bunbunbunbun/bun-base:latest as lolhtml + +ARG DEBIAN_FRONTEND=noninteractive +ARG GITHUB_WORKSPACE=/build +ARG ZIG_PATH=${GITHUB_WORKSPACE}/zig +# Directory extracts to "bun-webkit" +ARG WEBKIT_DIR=${GITHUB_WORKSPACE}/bun-webkit +ARG BUN_RELEASE_DIR=${GITHUB_WORKSPACE}/bun-release +ARG BUN_DEPS_OUT_DIR=${GITHUB_WORKSPACE}/bun-deps +ARG BUN_DIR=${GITHUB_WORKSPACE}/bun + +COPY Makefile ${BUN_DIR}/Makefile +COPY src/deps/lol-html ${BUN_DIR}/src/deps/lol-html + +RUN cd ${BUN_DIR} && \ + make lolhtml && rm -rf src/deps/lol-html Makefile + FROM bunbunbunbun/bun-base:latest as mimalloc ARG DEBIAN_FRONTEND=noninteractive @@ -174,6 +192,7 @@ COPY ./package.json ${BUN_DIR}/package.json COPY ./misctools ${BUN_DIR}/misctools COPY Makefile ${BUN_DIR}/Makefile +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=picohttp ${BUN_DEPS_OUT_DIR}/*.o ${BUN_DEPS_OUT_DIR}/ diff --git a/Dockerfile.base b/Dockerfile.base index 6e9944ca3..ae710f302 100644 --- a/Dockerfile.base +++ b/Dockerfile.base @@ -43,6 +43,7 @@ RUN apt-get update && \ lld-13 \ libicu-dev \ wget \ + rustc \ unzip \ tar \ golang-go ninja-build pkg-config automake autoconf libtool curl && \ |