From 91890456dab468c1efffeb89b0f725818072ee03 Mon Sep 17 00:00:00 2001
From: LongYinan <lynweklm@gmail.com>
Date: Mon, 21 Nov 2022 14:44:53 +0800
Subject: [PATCH] build: focal->jammy, llvm-14->llvm-15 (#1369)

---
 alpine-zig.Dockerfile     |  2 +-
 debian-aarch64.Dockerfile | 22 +++++++++++-----------
 debian-zig.Dockerfile     |  2 +-
 debian.Dockerfile         | 25 +++++++++++++------------
 4 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/alpine-zig.Dockerfile b/alpine-zig.Dockerfile
index febdb853..caa8ef7c 100644
--- a/alpine-zig.Dockerfile
+++ b/alpine-zig.Dockerfile
@@ -1,6 +1,6 @@
 FROM ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-alpine
 
-ARG ZIG_VERSION=0.9.1
+ARG ZIG_VERSION=0.10.0
 
 RUN apk add xz && \
   rustup target add x86_64-unknown-linux-gnu && \
diff --git a/debian-aarch64.Dockerfile b/debian-aarch64.Dockerfile
index 3207d964..aa1ce48f 100644
--- a/debian-aarch64.Dockerfile
+++ b/debian-aarch64.Dockerfile
@@ -12,16 +12,16 @@ ENV RUSTUP_HOME=/usr/local/rustup \
 RUN apt-get update && \
   apt-get install -y --fix-missing --no-install-recommends gpg-agent ca-certificates openssl && \
   wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - && \
-  echo "deb http://apt.llvm.org/focal/ llvm-toolchain-focal-14 main" >> /etc/apt/sources.list && \
-  echo "deb-src http://apt.llvm.org/focal/ llvm-toolchain-focal-14 main" >> /etc/apt/sources.list && \
+  echo "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-15 main" >> /etc/apt/sources.list && \
+  echo "deb-src http://apt.llvm.org/jammy/ llvm-toolchain-jammy-15 main" >> /etc/apt/sources.list && \
   curl -sL https://deb.nodesource.com/setup_16.x | bash - && \
   apt-get install -y --fix-missing --no-install-recommends \
   curl \
-  llvm-14 \
-  clang-14 \
-  lld-14 \
-  libc++-14-dev \
-  libc++abi-14-dev \
+  llvm-15 \
+  clang-15 \
+  lld-15 \
+  libc++-15-dev \
+  libc++abi-15-dev \
   nodejs \
   xz-utils \
   rcs \
@@ -35,7 +35,7 @@ RUN apt-get update && \
   npm install -g yarn pnpm lerna && \
   npm cache clean --force && \
   npm cache verify && \
-  ln -sf /usr/bin/clang-14 /usr/bin/clang && \
-  ln -sf /usr/bin/clang++-14 /usr/bin/clang++ && \
-  ln -sf /usr/bin/lld-14 /usr/bin/lld && \
-  ln -sf /usr/bin/clang-14 /usr/bin/cc
+  ln -sf /usr/bin/clang-15 /usr/bin/clang && \
+  ln -sf /usr/bin/clang++-15 /usr/bin/clang++ && \
+  ln -sf /usr/bin/lld-15 /usr/bin/lld && \
+  ln -sf /usr/bin/clang-15 /usr/bin/cc
diff --git a/debian-zig.Dockerfile b/debian-zig.Dockerfile
index 57a2a069..da2c3fa6 100644
--- a/debian-zig.Dockerfile
+++ b/debian-zig.Dockerfile
@@ -1,6 +1,6 @@
 FROM ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-debian
 
-ARG ZIG_VERSION=0.9.1
+ARG ZIG_VERSION=0.10.0
 
 RUN wget https://ziglang.org/download/${ZIG_VERSION}/zig-linux-x86_64-${ZIG_VERSION}.tar.xz && \
   tar -xvf zig-linux-x86_64-${ZIG_VERSION}.tar.xz && \
diff --git a/debian.Dockerfile b/debian.Dockerfile
index a47cb9e5..5319e401 100644
--- a/debian.Dockerfile
+++ b/debian.Dockerfile
@@ -9,21 +9,22 @@ ENV RUSTUP_HOME=/usr/local/rustup \
   CXX=clang++ \
   CC_x86_64_unknown_linux_gnu=clang \
   CXX_x86_64_unknown_linux_gnu=clang++ \
-  RUST_TARGET=x86_64-unknown-linux-gnu
+  RUST_TARGET=x86_64-unknown-linux-gnu \
+  LDFLAGS="-fuse-ld=lld"
 
 RUN apt-get update && \
   apt-get install -y --fix-missing --no-install-recommends gpg-agent ca-certificates openssl && \
   wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - && \
-  echo "deb http://apt.llvm.org/focal/ llvm-toolchain-focal-14 main" >> /etc/apt/sources.list && \
-  echo "deb-src http://apt.llvm.org/focal/ llvm-toolchain-focal-14 main" >> /etc/apt/sources.list && \
+  echo "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-15 main" >> /etc/apt/sources.list && \
+  echo "deb-src http://apt.llvm.org/jammy/ llvm-toolchain-jammy-15 main" >> /etc/apt/sources.list && \
   curl -sL https://deb.nodesource.com/setup_16.x | bash - && \
   apt-get install -y --fix-missing --no-install-recommends \
   curl \
-  llvm-14 \
-  clang-14 \
-  lld-14 \
-  libc++-14-dev \
-  libc++abi-14-dev \
+  llvm-15 \
+  clang-15 \
+  lld-15 \
+  libc++-15-dev \
+  libc++abi-15-dev \
   nodejs \
   xz-utils \
   rcs \
@@ -34,10 +35,10 @@ RUN apt-get update && \
   apt-get autoremove -y && \
   curl https://sh.rustup.rs -sSf | sh -s -- -y && \
   npm install -g yarn pnpm lerna && \
-  ln -sf /usr/bin/clang-14 /usr/bin/clang && \
-  ln -sf /usr/bin/clang++-14 /usr/bin/clang++ && \
-  ln -sf /usr/bin/lld-14 /usr/bin/lld && \
-  ln -sf /usr/bin/clang-14 /usr/bin/cc
+  ln -sf /usr/bin/clang-15 /usr/bin/clang && \
+  ln -sf /usr/bin/clang++-15 /usr/bin/clang++ && \
+  ln -sf /usr/bin/lld-15 /usr/bin/lld && \
+  ln -sf /usr/bin/clang-15 /usr/bin/cc
 
 RUN wget https://www.nasm.us/pub/nasm/releasebuilds/${NASM_VERSION}/nasm-${NASM_VERSION}.tar.xz && \
   tar -xf nasm-${NASM_VERSION}.tar.xz && \