Do not put NodeJS repo into Ubuntu 24.04 build image (#281)

* Do not put NodeJS repo into Ubuntu 24.04 build image Fixes #280 * Future proof conditional
OSC · Oct 23, 2024 · f777543 · f777543
1 parent c099b1a
commit f777543
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ood_packaging (0.15.1)
+    ood_packaging (0.15.2)
       rake (~> 13.0.1)
 
 GEM

diff --git a/lib/ood_packaging/build_box/docker-image/Dockerfile.erb b/lib/ood_packaging/build_box/docker-image/Dockerfile.erb
@@ -32,7 +32,7 @@ RUN apt update -y && apt install -y apt-transport-https ca-certificates \
     init debhelper devscripts dh-make build-essential apt-cudf lintian equivs \
     sudo rake wget curl ruby bundler && \
     apt clean all -y
-<% if ! ['bookworm'].include?(codename) && arch != 'ppc64le' %>
+<% if ['focal', 'jammy'].include?(codename) && arch != 'ppc64le' %>
 RUN echo "deb https://deb.nodesource.com/node_<%= nodejs_version %>.x nodistro main" > /etc/apt/sources.list.d/nodesource.list
 RUN curl -s https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor > /etc/apt/trusted.gpg.d/nodesource.gpg
 <% end %>

diff --git a/lib/ood_packaging/version.rb b/lib/ood_packaging/version.rb
@@ -2,7 +2,7 @@
 
 # Version code for OodPackaging
 module OodPackaging
-  VERSION = '0.15.1'
+  VERSION = '0.15.2'
   PACKAGE_VERSION = {
     'ondemand-release'        => {
       '(ubuntu|debian)' => '3.1.2',