aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Dockerfile28
1 files changed, 11 insertions, 17 deletions
diff --git a/Dockerfile b/Dockerfile
index 23928bb1c..b6fec71ca 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,6 +3,8 @@ FROM ubuntu:20.04
ARG DEBIAN_FRONTEND=noninteractive
RUN apt-get update && apt-get install --no-install-recommends -y wget gnupg2 curl lsb-release wget software-properties-common
+
+RUN add-apt-repository ppa:longsleep/golang-backports
RUN curl -s https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add -
RUN wget https://apt.llvm.org/llvm.sh --no-check-certificate
@@ -33,10 +35,10 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
libicu-dev \
wget \
unzip \
- tar
+ tar \
+ golang-go chromium-browser ninja-build pkg-config automake autoconf libtool
-RUN update-alternatives --install /usr/bin/ld ld /usr/bin/lld-12 90 && \
- update-alternatives --install /usr/bin/cc cc /usr/bin/clang-12 90 && \
+RUN update-alternatives --install /usr/bin/cc cc /usr/bin/clang-12 90 && \
update-alternatives --install /usr/bin/cpp cpp /usr/bin/clang++-12 90 && \
update-alternatives --install /usr/bin/c++ c++ /usr/bin/clang++-12 90
@@ -47,30 +49,22 @@ WORKDIR /home/ubuntu
ARG BUILDARCH
ENV ARCH "$BUILDARCH"
-
RUN npm install -g esbuild
-RUN wget https://github.com/Jarred-Sumner/zig/releases/download/dec20/zig-linux-$ARCH.zip; \
- unzip zig-linux-$ARCH.zip; \
- rm zig-linux-$ARCH.zip;
+RUN wget https://github.com/Jarred-Sumner/zig/releases/download/dec20/zig-linux-$BUILDARCH.zip; \
+ unzip zig-linux-$BUILDARCH.zip; \
+ rm zig-linux-$BUILDARCH.zip;
ENV WEBKIT_OUT_DIR /home/ubuntu/bun-webkit
WORKDIR /home/ubuntu
-RUN wget https://github.com/Jarred-Sumner/WebKit/releases/download/Bun-v0/bun-webkit-linux-$ARCH.tar.gz; \
- tar -xzvf bun-webkit-linux-$ARCH.tar.gz; \
- rm bun-webkit-linux-$ARCH.tar.gz && cat $WEBKIT_OUT_DIR/include/cmakeconfig.h > /dev/null
-
-
-
-RUN add-apt-repository ppa:longsleep/golang-backports
-RUN apt update
-RUN apt install golang-go chromium-browser --no-install-recommends ninja-build pkg-config automake autoconf libtool -y --no-install-recommends
+RUN wget https://github.com/Jarred-Sumner/WebKit/releases/download/Bun-v0/bun-webkit-linux-$BUILDARCH.tar.gz; \
+ tar -xzvf bun-webkit-linux-$BUILDARCH.tar.gz; \
+ rm bun-webkit-linux-$BUILDARCH.tar.gz && cat $WEBKIT_OUT_DIR/include/cmakeconfig.h > /dev/null
ADD . /home/ubuntu/bun
-
WORKDIR /home/ubuntu
RUN wget https://github.com/unicode-org/icu/releases/download/release-66-1/icu4c-66_1-src.tgz && \
tar -xzf icu4c-66_1-src.tgz && \