Skip to content

Commit 23b7bdf

Browse files
Jarred-Sumnerpaperclover
authored andcommitted
fix dockerfile (oven-sh#5439)
* fixup docker * Update Dockerfile * Update Dockerfile --------- Co-authored-by: Jarred Sumner <[email protected]>
1 parent ea3c6e4 commit 23b7bdf

File tree

1 file changed

+12
-14
lines changed

1 file changed

+12
-14
lines changed

Dockerfile

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,13 @@ ARG BUN_BASE_VERSION=1.0
2424

2525
FROM bitnami/minideb:bullseye as bun-base
2626

27-
RUN install_packages ca-certificates curl wget lsb-release software-properties-common gnupg gnupg1 gnupg2
28-
29-
RUN wget https://apt.llvm.org/llvm.sh && \
30-
chmod +x llvm.sh && \
31-
./llvm.sh 16
32-
33-
RUN install_packages \
27+
RUN install_packages ca-certificates curl wget lsb-release software-properties-common gnupg gnupg1 gnupg2 && \
28+
echo "deb https://apt.llvm.org/bullseye/ llvm-toolchain-bullseye-16 main" > /etc/apt/sources.list.d/llvm.list && \
29+
echo "deb-src https://apt.llvm.org/bullseye/ llvm-toolchain-bullseye-16 main" >> /etc/apt/sources.list.d/llvm.list && \
30+
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - && \
31+
curl -fsSL https://deb.nodesource.com/setup_lts.x | bash - && \
32+
install_packages \
3433
cmake \
35-
curl \
3634
file \
3735
git \
3836
gnupg \
@@ -46,17 +44,17 @@ RUN install_packages \
4644
rsync \
4745
ruby \
4846
unzip \
47+
clang-16 \
48+
lld-16 \
49+
lldb-16 \
50+
clangd-16 \
4951
xz-utils \
50-
bash tar gzip ccache
52+
bash tar gzip ccache nodejs && \
53+
npm install -g esbuild
5154

5255
ENV CXX=clang++-16
5356
ENV CC=clang-16
5457

55-
RUN curl -fsSL https://deb.nodesource.com/setup_lts.x | bash - && \
56-
install_packages nodejs && \
57-
npm install -g esbuild
58-
59-
6058
ARG DEBIAN_FRONTEND
6159
ARG GITHUB_WORKSPACE
6260
ARG WEBKIT_DIR

0 commit comments

Comments
 (0)