ood_packaging 0.10.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bfd4871399685168cb1e47dfdd31c283e203cd1c2c48b573d385379e536c4297
-  data.tar.gz: 392e1e6137c8564004b05d6ad142b37132e927302f94f9ef53245a6fe2695160
+  metadata.gz: f77bc1e85f9a6c049c43d9931ce9c8720c9bf8c0fac0b6232a24960e4bcbe388
+  data.tar.gz: 960644b6ecb3e8e73314602590e933bbcfc595ef3588e4be5fed7b486cf80152
 SHA512:
-  metadata.gz: da5b298b43c9e18150d7bbcae2ca4f540ac7583db5475336536a4f123375ce1f030570b9ce655063d573047f4a259ddb925e92c9d491fb5da2d95098cf934972
-  data.tar.gz: 3368909d19738083dabef1f28d39bbbdd16013a0d653bd3580b535253e475357aebf520af82e726fd8c782ebf1cac31a2259723d73220af5518575c0cc219792
+  metadata.gz: 72ace2609fdfda7a9e4b6191925543f293458895847118ce2848d8edf2509d0eec4547032def3d6cc252581e039fe785868e739908ac7280610016048b61a3e3
+  data.tar.gz: 7edac14c5ec2467d4307b0a733a0167b8469fc76688cbed308aec6a7cba07762e2d4eabb29d9ff0af2885aaa2209dad948a908814e0cad0f04436a2c67b1dc29

data/lib/ood_packaging/build_box/docker-image/Dockerfile.erb

@@ -20,10 +20,12 @@ RUN dnf update -y && dnf clean all && rm -rf /var/cache/dnf/*
 RUN dnf install -y dnf-utils <%= dist =~ /^el/ ? 'epel-release' : '' %> langpacks-en glibc-langpack-en && dnf clean all && rm -rf /var/cache/dnf/*
 <% if dist == 'el8' -%>
 RUN dnf config-manager --set-enabled powertools && dnf clean all && rm -rf /var/cache/dnf/*
-RUN dnf module enable -y ruby:<%= ruby_version %> nodejs:<%= nodejs_version %> && dnf clean all && rm -rf /var/cache/dnf/*
 <% elsif dist == 'el9' -%>
 RUN dnf config-manager --set-enabled crb && dnf clean all && rm -rf /var/cache/dnf/*
 <% end -%>
+<% if dist =~ /^el/ -%>
+RUN dnf module enable -y ruby:<%= ruby_version %> nodejs:<%= nodejs_version %> && dnf clean all && rm -rf /var/cache/dnf/*
+<% end -%>
 RUN dnf install -y --allowerasing systemd ruby nodejs sudo which wget \
     gcc-c++ gcc make patch shadow-utils gnupg2 \
     rpm-build rpmdevtools rpm-sign <%= dist =~ /^el/ ? 'scl-utils-build' : '' %> && \

data/lib/ood_packaging/utils.rb

@@ -63,7 +63,9 @@ module OodPackaging::Utils
   end
 
   def ruby_version
-    '3.0'
+    return '3.0' if dist == 'el7'
+
+    '3.1'
   end
 
   def scl_ruby
@@ -71,7 +73,7 @@ module OodPackaging::Utils
   end
 
   def nodejs_version
-    '14'
+    '18'
   end
 
   def ctr_scripts_dir

data/lib/ood_packaging/version.rb

@@ -2,17 +2,17 @@
 
 # Version code for OodPackaging
 module OodPackaging
-  VERSION = '0.10.0'
+  VERSION = '0.11.0'
   PACKAGE_VERSION = {
     'ondemand-release'        => {
       '(ubuntu|debian)' => '3.1.0',
       'default'         => '3.1'
     },
     'ondemand-release-latest' => {
-      '(ubuntu|debian)' => '1',
+      '(ubuntu|debian)' => '2',
       'default'         => '1-8'
     },
-    'ondemand-runtime'        => '3.1.2',
+    'ondemand-runtime'        => '3.1.3',
     'scl-utils'               => '2.0.3',
     'passenger'               => '6.0.17',
     'cjose'                   => '0.6.1',

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ood_packaging
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
 platform: ruby
 authors:
 - Trey Dockendorf
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-06-16 00:00:00.000000000 Z
+date: 2023-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake