From 78b60bfc0cdfc5b26889d0d6715b1e8b58acd8ca Mon Sep 17 00:00:00 2001 From: Katie McLaughlin Date: Tue, 3 Sep 2024 14:33:44 +1000 Subject: [PATCH] update system deps --- run/rails/Dockerfile | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/run/rails/Dockerfile b/run/rails/Dockerfile index 99eae2f94..e514de029 100644 --- a/run/rails/Dockerfile +++ b/run/rails/Dockerfile @@ -2,18 +2,11 @@ # https://hub.docker.com/_/ruby # [START cloudrun_rails_base_image] -# Pinning the OS to bookworm because the nodejs install script is bookworm-specific. -# Be sure to update the nodejs install command if the base image OS is updated. FROM ruby:3.3-bookworm # [END cloudrun_rails_base_image] -RUN (curl -sS https://deb.nodesource.com/gpgkey/nodesource.gpg.key | gpg --dearmor | apt-key add -) && \ - echo "deb https://deb.nodesource.com/node_22.x bookworm main" > /etc/apt/sources.list.d/nodesource.list && \ - apt-get update && apt-get install -y nodejs lsb-release - -RUN (curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -) && \ - echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list && \ - apt-get update && apt-get install -y yarn +RUN apt update && apt install yarnpkg nodejs && \ + ln -s /usr/bin/yarnpkg /usr/bin/yarn WORKDIR /app @@ -25,7 +18,6 @@ RUN gem install bundler && \ bundle config set --local without 'development test' && \ bundle install - # Copy application code to the container image COPY . /app