Redo the dockerfile

RyoH908 · Jul 21, 2022 · 588669e · 588669e
1 parent e6c58ae
commit 588669e
Show file tree

Hide file tree

Showing 5 changed files with 203 additions and 222 deletions.
diff --git a/.docker/build-base-images.sh b/.docker/build-base-images.sh
@@ -6,10 +6,10 @@ export DOCKER_BUILDKIT=1
 
 docker login --username bunbunbunbun
 
-docker build -f Dockerfile.base -t bunbunbunbun/bun-test-base --target bun-test-base . --platform=linux/$BUILDARCH --build-arg BUILDARCH=$BUILDARCH
+# docker build -f Dockerfile.base -t bunbunbunbun/bun-test-base --target bun-test-base . --platform=linux/$BUILDARCH --build-arg BUILDARCH=$BUILDARCH
 docker build -f Dockerfile.base -t bunbunbunbun/bun-base-with-zig-and-webkit --target bun-base-with-zig-and-webkit . --platform=linux/$BUILDARCH --build-arg BUILDARCH=$BUILDARCH
 docker build -f Dockerfile.base -t bunbunbunbun/bun-base --target bun-base --platform=linux/$BUILDARCH . --build-arg BUILDARCH=$BUILDARCH
 
-docker push bunbunbunbun/bun-test-base:latest
+# docker push bunbunbunbun/bun-test-base:latest
 docker push bunbunbunbun/bun-base-with-zig-and-webkit:latest
 docker push bunbunbunbun/bun-base:latest
diff --git a/.docker/build-base.sh b/.docker/build-base.sh
@@ -4,10 +4,10 @@ set -euxo pipefail
 
 export DOCKER_BUILDKIT=1
 
-docker buildx build \
-    -t bunbunbunbun/bun-test-base:latest -f Dockerfile.base \
-    --target bun-test-base \
-    --platform=linux/$BUILDARCH --build-arg BUILDARCH=$BUILDARCH .
+# docker buildx build \
+#     -t bunbunbunbun/bun-test-base:latest -f Dockerfile.base \
+#     --target bun-test-base \
+#     --platform=linux/$BUILDARCH --build-arg BUILDARCH=$BUILDARCH .
 docker buildx build \
     --target bun-base \
     -f Dockerfile.base \
@@ -19,6 +19,6 @@ docker buildx build \
     --target bun-base-with-zig-and-webkit \
     --platform=linux/$BUILDARCH --build-arg BUILDARCH=$BUILDARCH .
 
-docker push bunbunbunbun/bun-test-base:latest
+# docker push bunbunbunbun/bun-test-base:latest
 docker push bunbunbunbun/bun-base:latest
 docker push bunbunbunbun/bun-base-with-zig-and-webkit:latest
diff --git a/Dockerfile b/Dockerfile
@@ -1,6 +1,8 @@
 
 FROM bunbunbunbun/bun-base:latest as lolhtml
 
+RUN install_packages build-essential && curl https://sh.rustup.rs -sSf | sh -s -- -y
+
 ARG DEBIAN_FRONTEND=noninteractive
 ARG GITHUB_WORKSPACE=/build
 ARG ZIG_PATH=${GITHUB_WORKSPACE}/zig
@@ -13,7 +15,7 @@ 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} && \
+RUN export PATH=$PATH:$HOME/.cargo/bin && export CC=$(which clang-13) && cd ${BUN_DIR} && \
     make lolhtml && rm -rf src/deps/lol-html Makefile
 
 FROM bunbunbunbun/bun-base:latest as mimalloc
@@ -68,7 +70,7 @@ COPY src/deps/libarchive ${BUN_DIR}/src/deps/libarchive
 
 WORKDIR $BUN_DIR
 
-RUN cd $BUN_DIR && \
+RUN cd $BUN_DIR && install_packages autoconf automake libtool pkg-config  && \ 
     make libarchive && rm -rf src/deps/libarchive Makefile
 
 FROM bunbunbunbun/bun-base:latest as tinycc
@@ -87,9 +89,7 @@ COPY src/deps/tinycc ${BUN_DIR}/src/deps/tinycc
 
 WORKDIR $BUN_DIR
 
-RUN cd $BUN_DIR && \
-    make tinycc && rm -rf src/deps/tinycc Makefile
-
+RUN install_packages libtcc-dev && cp /usr/lib/$(uname -m)-linux-gnu/libtcc.a ${BUN_DEPS_OUT_DIR}
 
 FROM bunbunbunbun/bun-base:latest as libbacktrace
 
@@ -126,7 +126,7 @@ COPY src/deps/boringssl ${BUN_DIR}/src/deps/boringssl
 
 WORKDIR $BUN_DIR
 
-RUN make boringssl && rm -rf src/deps/boringssl Makefile
+RUN install_packages golang && make boringssl && rm -rf src/deps/boringssl Makefile
 
 FROM bunbunbunbun/bun-base:latest as base64
 
@@ -253,6 +253,56 @@ COPY ./package.json ${BUN_DIR}/package.json
 COPY ./misctools ${BUN_DIR}/misctools
 COPY Makefile ${BUN_DIR}/Makefile
 
+
+FROM prepare_release as compile_release_obj
+
+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
+
+WORKDIR $BUN_DIR
+
+ENV JSC_BASE_DIR=${WEBKIT_DIR}
+ENV LIB_ICU_PATH=${WEBKIT_DIR}/lib
+ARG TRIPLET=x86_64-linux-gnu
+
+COPY --from=identifier_cache ${BUN_DIR}/src/js_lexer/*.blob ${BUN_DIR}/src/js_lexer/
+COPY --from=node_fallbacks ${BUN_DIR}/src/node-fallbacks/out ${BUN_DIR}/src/node-fallbacks/out
+
+RUN cd $BUN_DIR && mkdir -p src/bun.js/bindings-obj &&  rm -rf $HOME/.cache zig-cache && make prerelease && \
+    mkdir -p $BUN_RELEASE_DIR && \
+    $ZIG_PATH/zig build obj -Drelease-fast -Dtarget=${TRIPLET} && \
+    make bun-release-copy-obj
+
+FROM scratch as build_release_obj
+
+COPY --from=compile_release_obj /tmp/*.o /
+
+FROM prepare_release as compile_cpp
+
+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
+
+WORKDIR $BUN_DIR
+
+ENV JSC_BASE_DIR=${WEBKIT_DIR}
+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}/
@@ -264,13 +314,11 @@ COPY --from=libbacktrace ${BUN_DEPS_OUT_DIR}/*.a ${BUN_DEPS_OUT_DIR}/
 COPY --from=zlib ${BUN_DEPS_OUT_DIR}/*.a ${BUN_DEPS_OUT_DIR}/
 COPY --from=tinycc ${BUN_DEPS_OUT_DIR}/*.a ${BUN_DEPS_OUT_DIR}/
 COPY --from=base64 ${BUN_DEPS_OUT_DIR}/*.a ${BUN_DEPS_OUT_DIR}/
-COPY --from=identifier_cache ${BUN_DIR}/src/js_lexer/*.blob ${BUN_DIR}/src/js_lexer/
-COPY --from=node_fallbacks ${BUN_DIR}/src/node-fallbacks/out ${BUN_DIR}/src/node-fallbacks/out
 
-WORKDIR ${BUN_DIR}
+RUN cd $BUN_DIR && mkdir -p src/bun.js/bindings-obj &&  rm -rf $HOME/.cache zig-cache && mkdir -p $BUN_RELEASE_DIR && \
+    make jsc-bindings-mac -j10 && mv src/bun.js/bindings-obj/* /tmp
 
-
-FROM prepare_release as build_release
+FROM prepare_release as sqlite
 
 ARG DEBIAN_FRONTEND=noninteractive
 ARG GITHUB_WORKSPACE=/build
@@ -285,17 +333,16 @@ COPY Makefile ${BUN_DIR}/Makefile
 
 WORKDIR $BUN_DIR
 
-RUN cd $BUN_DIR && mkdir -p src/bun.js/bindings-obj &&  rm -rf $HOME/.cache zig-cache && make \
-    sqlite api \
-    analytics \
-    bun_error \
-    fallback_decoder && rm -rf $HOME/.cache zig-cache && \
-    mkdir -p $BUN_RELEASE_DIR && \
-    make jsc-bindings-mac -j10 && \
-    make release copy-to-bun-release-dir && \
-    rm -rf $HOME/.cache zig-cache misctools package.json build-id completions build.zig $(BUN_DIR)/packages
+ENV JSC_BASE_DIR=${WEBKIT_DIR}
+ENV LIB_ICU_PATH=${WEBKIT_DIR}/lib
 
-FROM prepare_release as build_unit
+RUN cd $BUN_DIR && make sqlite
+
+FROM scratch as build_release_cpp
+
+COPY --from=compile_cpp /tmp/*.o /
+
+FROM prepare_release as build_release
 
 ARG DEBIAN_FRONTEND=noninteractive
 ARG GITHUB_WORKSPACE=/build
@@ -306,20 +353,32 @@ 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
+
 WORKDIR $BUN_DIR
 
-ENV PATH "$ZIG_PATH:$PATH"
+ENV JSC_BASE_DIR=${WEBKIT_DIR}
+ENV LIB_ICU_PATH=${WEBKIT_DIR}/lib
 
-CMD make jsc-bindings-headers \
-    api \
-    analytics \
-    bun_error \
-    fallback_decoder \
-    jsc-bindings-mac -j10 && \
-    make \
-    run-all-unit-tests
+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}/
+COPY --from=boringssl ${BUN_DEPS_OUT_DIR}/*.a ${BUN_DEPS_OUT_DIR}/
+COPY --from=uws ${BUN_DEPS_OUT_DIR}/*.a ${BUN_DEPS_OUT_DIR}/
+COPY --from=uws ${BUN_DEPS_OUT_DIR}/*.o ${BUN_DEPS_OUT_DIR}/
+COPY --from=libbacktrace ${BUN_DEPS_OUT_DIR}/*.a ${BUN_DEPS_OUT_DIR}/
+COPY --from=zlib ${BUN_DEPS_OUT_DIR}/*.a ${BUN_DEPS_OUT_DIR}/
+COPY --from=tinycc ${BUN_DEPS_OUT_DIR}/*.a ${BUN_DEPS_OUT_DIR}/
+COPY --from=base64 ${BUN_DEPS_OUT_DIR}/*.a ${BUN_DEPS_OUT_DIR}/
+COPY --from=sqlite ${BUN_DEPS_OUT_DIR}/*.o  ${BUN_DEPS_OUT_DIR}/
+COPY --from=build_release_obj /*.o /tmp
+COPY --from=build_release_cpp /*.o ${BUN_DIR}/src/bun.js/bindings-obj/
 
-FROM bunbunbunbun/bun-base-with-zig-and-webkit:latest as bun.devcontainer
+RUN cd $BUN_DIR && mkdir -p ${BUN_RELEASE_DIR} && make bun-relink copy-to-bun-release-dir && \
+    rm -rf $HOME/.cache zig-cache misctools package.json build-id completions build.zig $(BUN_DIR)/packages
+
+FROM prepare_release as build_unit
 
 ARG DEBIAN_FRONTEND=noninteractive
 ARG GITHUB_WORKSPACE=/build
@@ -330,37 +389,25 @@ ARG BUN_RELEASE_DIR=${GITHUB_WORKSPACE}/bun-release
 ARG BUN_DEPS_OUT_DIR=${GITHUB_WORKSPACE}/bun-deps
 ARG BUN_DIR=${GITHUB_WORKSPACE}/bun
 
-ENV WEBKIT_OUT_DIR ${WEBKIT_DIR}
-ENV PATH "$ZIG_PATH:$PATH"
-ENV JSC_BASE_DIR $WEBKIT_OUT_DIR
-ENV LIB_ICU_PATH ${GITHUB_WORKSPACE}/icu/source/lib
-ENV BUN_RELEASE_DIR ${BUN_RELEASE_DIR}
-ENV PATH "${GITHUB_WORKSPACE}/packages/bun-linux-x64:${GITHUB_WORKSPACE}/packages/bun-linux-aarch64:${GITHUB_WORKSPACE}/packages/debug-bun-linux-x64:${GITHUB_WORKSPACE}/packages/debug-bun-linux-aarch64:$PATH"
-ENV PATH "/home/ubuntu/zls/zig-out/bin:$PATH"
-
-ENV BUN_INSTALL /home/ubuntu/.bun
-ENV XDG_CONFIG_HOME /home/ubuntu/.config
+WORKDIR $BUN_DIR
 
-RUN apt-get -y update && update-alternatives --install /usr/bin/lldb lldb /usr/bin/lldb-13 90
+ENV PATH "$ZIG_PATH:$PATH"
+ENV LIB_ICU_PATH "${WEBKIT_DIR}/lib"
 
-COPY .devcontainer/workspace.code-workspace $GITHUB_WORKSPACE/workspace.code-workspace
-COPY .devcontainer/zls.json $GITHUB_WORKSPACE/workspace.code-workspace
-COPY .devcontainer/limits.conf /etc/security/limits.conf
-COPY ".devcontainer/scripts/" /scripts/
-COPY ".devcontainer/scripts/getting-started.sh" $GITHUB_WORKSPACE/getting-started.sh
-RUN mkdir -p /home/ubuntu/.bun /home/ubuntu/.config $GITHUB_WORKSPACE/bun && \
-    bash /scripts/common-debian.sh && \
-    bash /scripts/github.sh && \
-    bash /scripts/nice.sh && \
-    bash /scripts/zig-env.sh
-COPY .devcontainer/zls.json /home/ubuntu/.config/zls.json
+CMD make jsc-bindings-headers \
+    api \
+    analytics \
+    bun_error \
+    fallback_decoder \
+    jsc-bindings-mac -j10 && \
+    make \
+    run-all-unit-tests
 
-FROM ubuntu:20.04 as release_with_debug_info
+FROM alpine:latest as release_with_debug_info
 
 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
@@ -380,7 +427,7 @@ WORKDIR /opt/bun
 
 ENTRYPOINT [ "/opt/bun/bin/bun" ]
 
-FROM ubuntu:20.04 as release 
+FROM alpine:latest as release 
 
 ARG DEBIAN_FRONTEND=noninteractive
 ARG GITHUB_WORKSPACE=/build
@@ -398,49 +445,49 @@ ENV PATH "/opt/bun/bin:$PATH"
 ARG BUILDARCH=amd64
 LABEL org.opencontainers.image.title="bun ${BUILDARCH} (glibc)"
 LABEL org.opencontainers.image.source=https://github.com/jarred-sumner/bun
-COPY --from=build_release ${BUN_RELEASE_DIR}/bun /opt/bun/bin/bun
+COPY --from=build_release ${BUN_RELEASE_DIR}/bun /opt/bun
 WORKDIR /opt/bun
 
 ENTRYPOINT [ "/opt/bun/bin/bun" ]
 
 
-FROM bunbunbunbun/bun-test-base as test_base
+# FROM bunbunbunbun/bun-test-base as test_base
 
-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
+# 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
 
-ARG BUILDARCH=amd64
-RUN groupadd -r chromium && useradd   -d  ${BUN_DIR} -M -r -g chromium -G audio,video chromium \
-    && mkdir -p /home/chromium/Downloads && chown -R chromium:chromium /home/chromium
+# ARG BUILDARCH=amd64
+# RUN groupadd -r chromium && useradd   -d  ${BUN_DIR} -M -r -g chromium -G audio,video chromium \
+#     && mkdir -p /home/chromium/Downloads && chown -R chromium:chromium /home/chromium
 
-USER chromium
-WORKDIR $BUN_DIR
+# USER chromium
+# WORKDIR $BUN_DIR
 
-ENV NPM_CLIENT bun
-ENV PATH "${BUN_DIR}/packages/bun-linux-x64:${BUN_DIR}/packages/bun-linux-aarch64:$PATH"
-ENV CI 1
-ENV BROWSER_EXECUTABLE /usr/bin/chromium
+# ENV NPM_CLIENT bun
+# ENV PATH "${BUN_DIR}/packages/bun-linux-x64:${BUN_DIR}/packages/bun-linux-aarch64:$PATH"
+# ENV CI 1
+# ENV BROWSER_EXECUTABLE /usr/bin/chromium
 
-COPY ./test ${BUN_DIR}/test
-COPY Makefile ${BUN_DIR}/Makefile
-COPY package.json ${BUN_DIR}/package.json
-COPY .docker/run-test.sh ${BUN_DIR}/run-test.sh
-COPY ./bun.lockb ${BUN_DIR}/bun.lockb   
+# COPY ./test ${BUN_DIR}/test
+# COPY Makefile ${BUN_DIR}/Makefile
+# COPY package.json ${BUN_DIR}/package.json
+# COPY .docker/run-test.sh ${BUN_DIR}/run-test.sh
+# COPY ./bun.lockb ${BUN_DIR}/bun.lockb   
 
-# # We don't want to worry about architecture differences in this image
-COPY --from=release /opt/bun/bin/bun ${BUN_DIR}/packages/bun-linux-aarch64/bun
-COPY --from=release /opt/bun/bin/bun ${BUN_DIR}/packages/bun-linux-x64/bun
+# # # We don't want to worry about architecture differences in this image
+# COPY --from=release /opt/bun/bin/bun ${BUN_DIR}/packages/bun-linux-aarch64/bun
+# COPY --from=release /opt/bun/bin/bun ${BUN_DIR}/packages/bun-linux-x64/bun
 
-USER root
-RUN chgrp -R chromium ${BUN_DIR} && chmod g+rwx ${BUN_DIR} && chown -R chromium:chromium ${BUN_DIR}
-USER chromium
+# USER root
+# RUN chgrp -R chromium ${BUN_DIR} && chmod g+rwx ${BUN_DIR} && chown -R chromium:chromium ${BUN_DIR}
+# USER chromium
 
-CMD [ "bash", "run-test.sh" ]
+# CMD [ "bash", "run-test.sh" ]
 
-FROM release
+# FROM release