diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 13eda965a5d..2d1b9e019a1 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -28,8 +28,6 @@ RUN wget -qO /tmp/im.tar.xz https://imagemagick.org/download/releases/ImageMagic && ldconfig /usr/local/lib \ && rm -rf /tmp/* - -# [Optional] Uncomment this line to install additional gems. # Add the Rails main Gemfile and install the gems. This means the gem install can be done # during build instead of on start. When a fork or branch has different gems, we still have an # advantage due to caching of the other gems. @@ -51,6 +49,3 @@ RUN cd /tmp/rails \ && bundle install \ && yarn install \ && rm -rf /tmp/rails - -# [Optional] Uncomment this line to install global node packages. -# RUN su vscode -c "source /usr/local/share/nvm/nvm.sh && npm install -g " 2>&1 diff --git a/.devcontainer/boot.sh b/.devcontainer/boot.sh index ed65188d2d0..0a31fec59b1 100755 --- a/.devcontainer/boot.sh +++ b/.devcontainer/boot.sh @@ -1,6 +1,8 @@ bundle install yarn install +sudo chown -R vscode:vscode /usr/local/bundle/bundler + sudo service postgresql start sudo service mariadb start sudo service redis-server start diff --git a/Gemfile.lock b/Gemfile.lock index 8ef9d35fe48..db88c30d902 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -100,7 +100,7 @@ PATH actionpack (= 7.0.0.alpha2) activesupport (= 7.0.0.alpha2) method_source - rake (>= 0.13) + rake (>= 12.2) thor (~> 1.0) zeitwerk (~> 2.5.0.beta5) @@ -606,4 +606,4 @@ DEPENDENCIES websocket-client-simple! BUNDLED WITH - 2.2.28 + 2.2.29