From 777f280651212179b9f928f96eba4dc89cb4bbd6 Mon Sep 17 00:00:00 2001
From: James Meng <james.meng@shopify.com>
Date: Fri, 5 Jan 2024 00:28:20 +0000
Subject: [PATCH] Testing: Ruby version 3.0.0

---
 Dockerfile      | 38 +++++++++++++++++++++++++++++++++-----
 Dockerfile.base |  4 ++--
 2 files changed, 35 insertions(+), 7 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index cf1e893..d646c5f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,33 @@
-FROM cpclermont/lighthouse-ci-action:1.0.0
-RUN gem uninstall shopify-cli
-RUN gem install shopify-cli -N -n /usr/local/bin
-COPY entrypoint.sh /entrypoint.sh
-ENTRYPOINT ["/entrypoint.sh"]
+FROM node:14-buster
+
+ENV PATH="/root/.rbenv/shims:${PATH}"
+
+# Install dependencies
+RUN apt-get update \
+    && apt-get -y install sudo jq rbenv \
+    && mkdir -p "$(rbenv root)"/plugins \
+    && git clone https://github.com/rbenv/ruby-build.git "$(rbenv root)"/plugins/ruby-build \
+    && git -C "$(rbenv root)"/plugins/ruby-build pull \
+    && rbenv install 3.0.0 \
+    && rbenv global 3.0.0 \
+    && gem install shopify-cli -N
+
+###
+# Chrome in Docker fix
+# Install latest chrome dev package and fonts to support major charsets (Chinese, Japanese, Arabic, Hebrew, Thai and a few others)
+# Note: this installs the necessary libs to make the bundled version of Chromium that Puppeteer installs, work.
+RUN apt-get update \
+    && apt-get install -y wget gnupg \
+    && wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - \
+    && sh -c 'echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list' \
+    && apt-get update \
+    && apt-get install -y google-chrome-stable fonts-ipafont-gothic fonts-wqy-zenhei fonts-thai-tlwg fonts-kacst fonts-freefont-ttf libxss1 \
+      --no-install-recommends \
+    && rm -rf /var/lib/apt/lists/*
+
+ENV npm_config_prefix="$GITHUB_WORKSPACE/.node"
+ENV PATH="$npm_config_prefix:${PATH}"
+RUN mkdir -p "$npm_config_prefix" \
+  && chmod -R 777 "$npm_config_prefix" \
+  && umask 000 \
+  && npm install -g @lhci/cli@0.8.x puppeteer
diff --git a/Dockerfile.base b/Dockerfile.base
index df7b152..d646c5f 100644
--- a/Dockerfile.base
+++ b/Dockerfile.base
@@ -8,8 +8,8 @@ RUN apt-get update \
     && mkdir -p "$(rbenv root)"/plugins \
     && git clone https://github.com/rbenv/ruby-build.git "$(rbenv root)"/plugins/ruby-build \
     && git -C "$(rbenv root)"/plugins/ruby-build pull \
-    && rbenv install 2.7.5 \
-    && rbenv global 2.7.5 \
+    && rbenv install 3.0.0 \
+    && rbenv global 3.0.0 \
     && gem install shopify-cli -N
 
 ###