From 0a9750f28dfbce83d5b9caf82fc4582d1d221f1d Mon Sep 17 00:00:00 2001
From: icyleaf <icyleaf.cn@gmail.com>
Date: Fri, 8 Mar 2024 10:17:10 +0000
Subject: [PATCH] =?UTF-8?q?chore:=20devcontainer=20debian=20=E5=8D=87?=
 =?UTF-8?q?=E7=BA=A7=E8=87=B3=20bookworm?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .devcontainer/Dockerfile.base | 24 +++++++++++-------------
 Gemfile.lock                  | 17 +++++++++++++++++
 2 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/.devcontainer/Dockerfile.base b/.devcontainer/Dockerfile.base
index 9778751bd..713e1fc04 100644
--- a/.devcontainer/Dockerfile.base
+++ b/.devcontainer/Dockerfile.base
@@ -1,4 +1,4 @@
-ARG VARIANT=bullseye
+ARG VARIANT=bookworm
 FROM mcr.microsoft.com/vscode/devcontainers/base:${VARIANT}
 
 # Update args in docker-compose.yaml to set the UID/GID of the "vscode" user.
@@ -53,30 +53,28 @@ LABEL zealot.containers.nodejs="$NODEJS_VERSION"
 ARG ASDF_DIR="/home/vscode/.asdf"
 ENV RUBY_YJIT_ENABLE=true
 ENV PATH "${ASDF_DIR}/bin:${ASDF_DIR}/shims:$PATH"
-RUN git clone https://github.com/asdf-vm/asdf.git ${ASDF_DIR}  && \
+RUN git clone --quiet https://github.com/asdf-vm/asdf.git ${ASDF_DIR} && \
     echo ". ${ASDF_DIR}/asdf.sh" >> ~/.bashrc && \
     sed -i -E "s/^plugins=\(.+\)$/plugins=(debian asdf git git-flow tmux yarn ruby gem bundler rails)/g" ~/.zshrc
-# Enable YJIT *NEED* Rsust 1.58.0+
+
+RUN asdf plugin add nodejs && \
+    asdf install nodejs $NODEJS_VERSION && \
+    asdf global nodejs $NODEJS_VERSION
+
+# Enable YJIT *NEED* RUST 1.58.0+
 RUN asdf plugin add rust && \
     asdf install rust latest && \
     asdf global rust latest
-RUN export RUBY_CONFIGURE_OPTS=--enable-yjit && \
+
+RUN export RUBY_CONFIGURE_OPTS="--enable-yjit" && \
     asdf plugin add ruby && \
     asdf install ruby $RUBY_VERSION && \
-    asdf global ruby ${RUBY_VERSION}
-RUN asdf plugin add nodejs && \
-    asdf install nodejs $NODEJS_VERSION && \
-    asdf global nodejs ${NODEJS_VERSION}
-
-LABEL zealot.containers.ruby="$RUBY_VERSION"
-LABEL zealot.containers.nodejs="$NODEJS_VERSION"
+    asdf global ruby $RUBY_VERSION
 
 WORKDIR /workspace
 
 COPY Gemfile Gemfile.lock ./
 RUN gem install bundler foreman && \
-    bundle lock --add-platform ruby && \
-    bundle config set force_ruby_platform true && \
     bundle install
 
 COPY package.json yarn.lock ./
diff --git a/Gemfile.lock b/Gemfile.lock
index 8826b4cbd..f33e76f27 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -181,6 +181,9 @@ GEM
     globalid (1.2.1)
       activesupport (>= 6.1)
     google-protobuf (3.22.3)
+    google-protobuf (3.22.3-arm64-darwin)
+    google-protobuf (3.22.3-x86_64-darwin)
+    google-protobuf (3.22.3-x86_64-linux)
     graphiql-rails (1.9.0)
       railties
       sprockets-rails
@@ -289,6 +292,12 @@ GEM
     nokogiri (1.16.2)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
+    nokogiri (1.16.2-arm64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.16.2-x86_64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.16.2-x86_64-linux)
+      racc (~> 1.4)
     oauth2 (1.4.11)
       faraday (>= 0.17.3, < 3.0)
       jwt (>= 1.0, < 3.0)
@@ -569,7 +578,15 @@ GEM
     zhexdump (0.0.2)
 
 PLATFORMS
+  arm64-darwin-20
+  arm64-darwin-21
+  arm64-darwin-22
   ruby
+  x86_64-darwin-18
+  x86_64-darwin-20
+  x86_64-darwin-21
+  x86_64-darwin-22
+  x86_64-linux
 
 DEPENDENCIES
   active_model_serializers (~> 0.10.14)