From d7b4c7793724af607be3142ced24246e2e459f62 Mon Sep 17 00:00:00 2001
From: Mac Siri <mac@forem.com>
Date: Tue, 15 Aug 2023 14:25:04 -0400
Subject: [PATCH] Fix Gitpod (#19914)

---
 .gitpod.dockerfile | 14 +++++++-------
 gitpod-init.sh     |  1 +
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/.gitpod.dockerfile b/.gitpod.dockerfile
index 1e849a046..1cb989f2c 100644
--- a/.gitpod.dockerfile
+++ b/.gitpod.dockerfile
@@ -1,15 +1,15 @@
 FROM gitpod/workspace-postgres
 
-# Install Ruby
-ENV RUBY_VERSION=3.1.4
-
 # Install the GitHub CLI
 RUN brew install gh
 
-# Taken from https://www.gitpod.io/docs/languages/ruby
-RUN echo "rvm_gems_path=/home/gitpod/.rvm" > ~/.rvmrc
-RUN bash -lc "rvm install ruby-$RUBY_VERSION && rvm use ruby-$RUBY_VERSION --default"
-RUN echo "rvm_gems_path=/workspace/.rvm" > ~/.rvmrc
+# Install Ruby
+ENV RUBY_VERSION=3.1.4
+RUN printf "rvm_gems_path=/home/gitpod/.rvm\n" > ~/.rvmrc \
+    && bash -lc "rvm reinstall $RUBY_VERSION && \
+                 rvm use $RUBY_VERSION --default" \
+    && printf "rvm_gems_path=/workspace/.rvm" > ~/.rvmrc \
+    && printf "{ rvm use \$(rvm current); } >/dev/null 2>&1\n" >> "$HOME/.bashrc.d/70-ruby"
 
 # Install Node and Yarn
 ENV NODE_VERSION=16.13.1
diff --git a/gitpod-init.sh b/gitpod-init.sh
index 7f895d4b7..2e9037e2e 100755
--- a/gitpod-init.sh
+++ b/gitpod-init.sh
@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
 
+ln -s "$(which ruby)" "$(rvm gemdir)/bin/ruby"
 cp .env_sample .env
 echo "APP_DOMAIN=\"$(gp url 3000 | cut -f 3 -d /)\"" >> .env
 echo 'APP_PROTOCOL="https://"' >> .env