Merge branch 'main' into v1.1

CentauriSolutions · Jan 7, 2024 · 22649de · 22649de
2 parents 550cdb2 + 3a41aae
commit 22649de
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git 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
 

diff --git 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
@@ -576,6 +576,7 @@ DEPENDENCIES
   rails-i18n
   redis (~> 4.0)
   redis-actionpack
+  rexml (~> 3.2, >= 3.2.5)
   rqrcode
   rspec-rails (~> 4)
   rubocop