Merge pull request #1465 from tryzealot/feat/upgrade-ruby-3.3-in-devc…

…ontainer

Upgrade Ruby to 3.3 in devcontainer

.devcontainer/Dockerfile.base

@@ -45,8 +45,8 @@ RUN curl -L https://github.com/DarthSim/overmind/releases/download/v${OVERMIND_V
 USER vscode
 
 # Install asdf, ruby (with YJIT enabled) and nodejs
-ARG RUBY_VERSION="3.2.2"
-ARG NODEJS_VERSION="18.18.2"
+ARG RUBY_VERSION="3.3.0"
+ARG NODEJS_VERSION="20.11.1"
 LABEL zealot.containers.ruby="$RUBY_VERSION"
 LABEL zealot.containers.nodejs="$NODEJS_VERSION"
 
@@ -59,17 +59,17 @@ RUN git clone --quiet https://github.com/asdf-vm/asdf.git ${ASDF_DIR} && \
 
 RUN asdf plugin add nodejs && \
     asdf install nodejs $NODEJS_VERSION && \
-    asdf global nodejs $NODEJS_VERSION
+    asdf global nodejs ${NODEJS_VERSION}
 
-# Enable YJIT *NEED* RUST 1.58.0+
+# 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" && \
     asdf plugin add ruby && \
     asdf install ruby $RUBY_VERSION && \
-    asdf global ruby $RUBY_VERSION
+    asdf global ruby ${RUBY_VERSION}
 
 WORKDIR /workspace
 

.tool-versions

@@ -1,2 +1,2 @@
-ruby 3.2.2
-nodejs 18.18.2
+ruby 3.3.0
+nodejs 20.11.1

Gemfile

@@ -63,7 +63,8 @@ gem 'openssl', '~> 3.2.0'
 gem 'plist', '~> 3.7.1'
 
 ## 系统信息
-gem 'sys-filesystem', '~> 1.4.4'
+# NOTE: rollback rubygem i the issue is resolved: https://github.com/djberg96/sys-filesystem/issues/66
+gem 'sys-filesystem', github: 'icyleaf/sys-filesystem', branch: 'fix/musl-remove-alias-statvfs64'
 gem 'vmstat', '~> 2.3.0'
 gem 'pghero', '~> 3.4.1'
 

Gemfile.lock

@@ -1,3 +1,11 @@
+GIT
+  remote: https://github.com/icyleaf/sys-filesystem
+  revision: 9e6f1017ef0ab5a5dc8dd04f9096e942b63b0f57
+  branch: fix/musl-remove-alias-statvfs64
+  specs:
+    sys-filesystem (1.4.4)
+      ffi (~> 1.1)
+
 GEM
   remote: https://rubygems.org/
   specs:
@@ -180,10 +188,7 @@ GEM
       rubyntlm (~> 0.5)
     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)
+    google-protobuf (3.22.5)
     graphiql-rails (1.10.0)
       railties
     graphql (2.3.0)
@@ -523,8 +528,6 @@ GEM
       attr_required (>= 0.0.5)
       faraday (~> 2.0)
       faraday-follow_redirects
-    sys-filesystem (1.4.4)
-      ffi (~> 1.1)
     temple (0.10.3)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
@@ -646,7 +649,7 @@ DEPENDENCIES
   simple_form (~> 5.3)
   slim-rails (~> 3.6.3)
   stimulus-rails (~> 1.3.3)
-  sys-filesystem (~> 1.4.4)
+  sys-filesystem!
   tiny_appstore_connect (~> 0.1.12)
   turbo-rails (~> 1.5)
   vmstat (~> 2.3.0)