Skip to content

Commit

Permalink
chore: devcontainer debian 升级至 bookworm
Browse files Browse the repository at this point in the history
  • Loading branch information
icyleaf committed Mar 8, 2024
1 parent a62f7d4 commit 0a9750f
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 13 deletions.
24 changes: 11 additions & 13 deletions .devcontainer/Dockerfile.base
Original file line number Diff line number Diff line change
@@ -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.
Expand Down Expand Up @@ -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 ./
Expand Down
17 changes: 17 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit 0a9750f

Please sign in to comment.