ood_packaging 0.16.0 → 0.16.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 11b7e45102c0d0c201baff4a765a5d38dd481209983addb2253bbaebefe0af1f
-  data.tar.gz: a914143cd38da521cdf4f3d6518bdc6f3000eb9ed0c6fab61e4e2b65b0db68a0
+  metadata.gz: eff4a0f6fa0ff76ca49d61e5f40c501bc3b17fec48362a1248c51405c38efa5c
+  data.tar.gz: 1b1f07e8033263cddcf2c14395c2a09b469709d1f216d47b992392139265ef3d
 SHA512:
-  metadata.gz: 02df56dbc12d14dcf181da72990cbd33d60c79aa8e3d8687d688f675a2570a9d2123fa5b3dec1c4349ff1cd4b29495386f50fedd78d809b09cda2a8e3442df20
-  data.tar.gz: f028b0ed979f39ede38aaf0b7f08f58473586ce41ab81748ea9f9dd3d032c1f9bace625d26d4300d5093b583950589458378202e06f375abbdc78d938ea9a6f3
+  metadata.gz: 0de7e65d78497327319ca1745569d6febce30c8ead3ae117b95beefbdb1b04db3c4eb0c7911ee45e613c8820730391640c972df9a3496fe3b77c76997f720f79
+  data.tar.gz: d7c7e2536fdab3d3405c531321e9b205fd40fa39893c50708d7a89b86abaacc86fc5a1e4ecf2b721f65e92bec0c9031d3e5fef4a3797d3878567fe81e6e7139d

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

@@ -18,10 +18,15 @@ RUN dnf config-manager --set-enabled crb && dnf clean all && rm -rf /var/cache/d
 <% 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 \
+RUN dnf install -y --allowerasing systemd sudo which wget \
+    <%= ruby_package %> <%= nodejs_package %> \
     gcc-c++ gcc make patch shadow-utils gnupg2 \
     rpm-build rpmdevtools rpm-sign <%= dist =~ /^el/ ? 'scl-utils-build' : '' %> && \
     dnf clean all && rm -rf /var/cache/dnf/*
+<% if dist == 'amzn2023' -%>
+RUN alternatives --install /usr/bin/node node /usr/bin/node-<%= nodejs_version %> 1 && \
+    alternatives --install /usr/bin/npm npm /usr/bin/npm-<%= nodejs_version %> 1
+<% end -%>
 <% elsif dist =~ /^ubuntu|debian/ -%>
 ENV DEBIAN_FRONTEND=noninteractive
 RUN apt update -y && apt upgrade -y && apt clean all -y
@@ -32,10 +37,8 @@ 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 ['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 %>
 <% end -%>
 RUN ln -s /dev/null /etc/systemd/system/proc-sys-fs-binfmt_misc.automount
 COPY . /build

data/lib/ood_packaging/utils.rb

@@ -63,13 +63,27 @@ module OodPackaging::Utils
   end
 
   def ruby_version
+    return '3.2' if dist == 'amzn2023'
+
     '3.3'
   end
 
+  def ruby_package
+    return "ruby#{ruby_version}" if dist == 'amzn2023'
+
+    'ruby'
+  end
+
   def nodejs_version
     '20'
   end
 
+  def nodejs_package
+    return "nodejs#{nodejs_version}" if dist == 'amzn2023'
+
+    'nodejs'
+  end
+
   def ctr_scripts_dir
     '/ondemand-packaging'
   end

data/lib/ood_packaging/version.rb

@@ -2,17 +2,17 @@
 
 # Version code for OodPackaging
 module OodPackaging
-  VERSION = '0.16.0'
+  VERSION = '0.16.1'
   PACKAGE_VERSION = {
     'ondemand-release'        => {
       '(ubuntu|debian)' => '4.0.0',
       'default'         => '4.0'
     },
     'ondemand-release-latest' => {
-      '(ubuntu|debian)' => '4',
+      '(ubuntu|debian)' => '5',
       'default'         => '1-8'
     },
-    'ondemand-runtime'        => '4.0.0',
+    'ondemand-runtime'        => '4.0.1',
     'scl-utils'               => '2.0.3',
     'passenger'               => '6.0.23',
     'cjose'                   => '0.6.1',

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ood_packaging
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.16.1
 platform: ruby
 authors:
 - Trey Dockendorf
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-11-08 00:00:00.000000000 Z
+date: 2024-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake