diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 1311cef7e02..53ae8b5a44a 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -4,6 +4,7 @@ "dockerFile": "../Dockerfile", "appPort": [4000], "postCreateCommand": "bundle install && npm install", + "containerEnv": {"DEVCONTAINER": "true"}, "extensions": [ "davidanson.vscode-markdownlint", "editorconfig.editorconfig", @@ -18,6 +19,6 @@ "errorLens.gutterIconsEnabled": true, "errorLens.addAnnotationTextPrefixes": false, "errorLens.enabledDiagnosticLevels": ["error", "warning"], - "terminal.integrated.shell.linux": "/bin/bash" + "terminal.integrated.shell.linux": "/usr/bin/zsh", } } diff --git a/Dockerfile b/Dockerfile index ef347e9e031..445458446aa 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,28 +7,22 @@ RUN \ su vscode -c \ "source /usr/local/share/nvm/nvm.sh && nvm install $(cat /tmp/.nvmrc) 2>&1" -# Set an environment variable to be able to detect we are in dev container -ENV DEVCONTAINER=true - # Locale env vars ENV \ LANG=en_US.UTF-8 \ LANGUAGE=en_US:en \ LC_ALL=en_US.UTF-8 -# Install git, process tools -RUN apt update && export DEBIAN_FRONTEND=noninteractive \ - && apt-get install -y --no-install-recommends \ - ack \ - git \ - locales \ - procps \ - && echo "en_US UTF-8" > /etc/locale.gen \ - && locale-gen en_US.UTF-8 \ - && echo 'export PS1="\\w\$ "' > /root/.bashrc \ - && apt-get autoremove -y \ - && apt-get clean -y \ - && rm -rf /var/lib/apt/lists/* +# Install tools +RUN \ + apt update \ + && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + ack \ + && echo "en_US UTF-8" > /etc/locale.gen \ + && locale-gen en_US.UTF-8 \ + && apt-get autoremove -y \ + && apt-get clean -y \ + && rm -rf /var/lib/apt/lists/* # Install the specific version of bundler we need COPY Gemfile.lock ./ diff --git a/Gemfile b/Gemfile index 12111262b14..ff95f49b6f2 100644 --- a/Gemfile +++ b/Gemfile @@ -8,6 +8,8 @@ group :development do gem 'compass', '1.0.3' gem 'sass-globbing', '1.1.5' gem 'stringex', '2.8.5' + # > 2.1.0 causes slowdowns https://github.com/sass/sassc-ruby/issues/189 + gem 'sassc', '2.1.0' end group :jekyll_plugins do diff --git a/Gemfile.lock b/Gemfile.lock index 5df2e88d874..a0893d5887c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -99,9 +99,9 @@ GEM sass (3.4.25) sass-globbing (1.1.5) sass (>= 3.1) - sassc (2.4.0) + sassc (2.1.0) ffi (~> 1.9) - sassc (2.4.0-x64-mingw32) + sassc (2.1.0-x64-mingw32) ffi (~> 1.9) sinatra (2.1.0) mustermann (~> 1.0) @@ -133,6 +133,7 @@ DEPENDENCIES nokogiri (= 1.11.1) rake (= 13.0.3) sass-globbing (= 1.1.5) + sassc (= 2.1.0) sinatra (= 2.1.0) stringex (= 2.8.5) tzinfo (~> 2.0)