diff --git a/.gitpod.dockerfile b/.gitpod.dockerfile index afb7084bb..f4f1ef292 100644 --- a/.gitpod.dockerfile +++ b/.gitpod.dockerfile @@ -2,8 +2,13 @@ FROM gitpod/workspace-postgres # Install Ruby ENV RUBY_VERSION=2.7.1 +RUN rm /home/gitpod/.rvmrc && touch /home/gitpod/.rvmrc && echo "rvm_gems_path=/home/gitpod/.rvm" > /home/gitpod/.rvmrc RUN bash -lc "rvm install ruby-$RUBY_VERSION && rvm use ruby-$RUBY_VERSION --default" +# Install Node +ENV NODE_VERSION=12.16.3 +RUN bash -lc ". .nvm/nvm.sh && nvm install $NODE_VERSION" + # Install Redis. RUN sudo apt-get update \ && sudo apt-get install -y \ diff --git a/.nvmrc b/.nvmrc index 499fd8b18..bb0f8faa5 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -12.16 \ No newline at end of file +12.16 diff --git a/config/environments/development.rb b/config/environments/development.rb index 5fe9ce377..9c537d455 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -75,6 +75,9 @@ Rails.application.configure do config.action_mailer.perform_caching = false config.hosts << ENV["APP_DOMAIN"] unless ENV["APP_DOMAIN"].nil? + if (gitpod_workspace_url = ENV["GITPOD_WORKSPACE_URL"]) + config.hosts << URI.parse(gitpod_workspace_url).host + end config.app_domain = "localhost:3000" config.action_mailer.default_url_options = { host: "localhost:3000" }