From 6e25e9eea778047d6a330c8cb49f6a0f8d238b38 Mon Sep 17 00:00:00 2001 From: Chris MacNaughton Date: Sun, 7 Jan 2024 09:22:30 -0500 Subject: [PATCH 1/4] Update node version for container build (#488) --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 755dde7..8def843 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,7 +9,7 @@ RUN groupadd -g 1000 appuser && \ RUN apt-get update -qq && apt-get install -y git build-essential libpq-dev graphviz # INSTALL NODE -RUN curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | sudo gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg && echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$16.x nodistro main" | sudo tee /etc/apt/sources.list.d/nodesource.list && sudo apt-get update && sudo apt-get install -yqq nodejs +RUN curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | sudo gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg && echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$21.x nodistro main" | sudo tee /etc/apt/sources.list.d/nodesource.list && sudo apt-get update && sudo apt-get install -yqq nodejs RUN mkdir /eyedp From 2b4012a5103063a02dc39cca10cf798aa5bc7524 Mon Sep 17 00:00:00 2001 From: Chris MacNaughton Date: Sun, 7 Jan 2024 09:30:49 -0500 Subject: [PATCH 2/4] Drop unnecessary use of sudo in container build (#489) --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 8def843..3e73ad2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,7 +9,7 @@ RUN groupadd -g 1000 appuser && \ RUN apt-get update -qq && apt-get install -y git build-essential libpq-dev graphviz # INSTALL NODE -RUN curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | sudo gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg && echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$21.x nodistro main" | sudo tee /etc/apt/sources.list.d/nodesource.list && sudo apt-get update && sudo apt-get install -yqq nodejs +RUN curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg && echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$21.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list && apt-get update && apt-get install -yqq nodejs RUN mkdir /eyedp From 188ecf0a3fa5941f07b4a2ee8a1942d6fd8c24ed Mon Sep 17 00:00:00 2001 From: Chris MacNaughton Date: Sun, 7 Jan 2024 09:36:09 -0500 Subject: [PATCH 3/4] Fix node version in dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 3e73ad2..65f065b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,7 +9,7 @@ RUN groupadd -g 1000 appuser && \ RUN apt-get update -qq && apt-get install -y git build-essential libpq-dev graphviz # INSTALL NODE -RUN curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg && echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$21.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list && apt-get update && apt-get install -yqq nodejs +RUN curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg && echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_21.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list && apt-get update && apt-get install -yqq nodejs RUN mkdir /eyedp From 3a41aaefb24b7b6b8c25961c289b43af7c286083 Mon Sep 17 00:00:00 2001 From: Chris MacNaughton Date: Sun, 7 Jan 2024 09:44:20 -0500 Subject: [PATCH 4/4] add explicit rexml to resolve rake failure --- Gemfile | 2 ++ Gemfile.lock | 1 + 2 files changed, 3 insertions(+) diff --git a/Gemfile b/Gemfile index 3c2a53b..8289d7e 100644 --- a/Gemfile +++ b/Gemfile @@ -90,6 +90,8 @@ gem 'sidekiq' gem 'sudo_rails' +gem 'rexml', '~> 3.2', '>= 3.2.5' + group :development, :test do gem 'pry-byebug' gem 'pry-rails' diff --git a/Gemfile.lock b/Gemfile.lock index 48d353a..3fc92ae 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -576,6 +576,7 @@ DEPENDENCIES rails-i18n redis (~> 4.0) redis-actionpack + rexml (~> 3.2, >= 3.2.5) rqrcode rspec-rails (~> 4) rubocop