ood_packaging 0.16.1 → 0.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eff4a0f6fa0ff76ca49d61e5f40c501bc3b17fec48362a1248c51405c38efa5c
-  data.tar.gz: 1b1f07e8033263cddcf2c14395c2a09b469709d1f216d47b992392139265ef3d
+  metadata.gz: a8190728b7e1f41bc6c10e9ff9479467681f57230ed3f625ec0736ab6131f94c
+  data.tar.gz: 1b59ad477ef6f97cfd7c8535e73f747592791d2616b5a98799ffbcb38643b218
 SHA512:
-  metadata.gz: 0de7e65d78497327319ca1745569d6febce30c8ead3ae117b95beefbdb1b04db3c4eb0c7911ee45e613c8820730391640c972df9a3496fe3b77c76997f720f79
-  data.tar.gz: d7c7e2536fdab3d3405c531321e9b205fd40fa39893c50708d7a89b86abaacc86fc5a1e4ecf2b721f65e92bec0c9031d3e5fef4a3797d3878567fe81e6e7139d
+  metadata.gz: 7df810dd51a61de6fff6f517a7d5e7403a89ad2020d18fed32c5e95b402be164ff3bbc61f6d810f8f987ab2f8e5c425f04e134e21c8f2f6c45c56a9a003dd6b2
+  data.tar.gz: 211b1976ca7907f50cad8bf23a6abc441de99c98d57e286ac6387981ba206fe272eee4ea6f89643c4c753ac831039d44fd24eb57847b8e02d47dbcdc79ec75ba

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

@@ -29,7 +29,12 @@ RUN alternatives --install /usr/bin/node node /usr/bin/node-<%= nodejs_version %
 <% end -%>
 <% elsif dist =~ /^ubuntu|debian/ -%>
 ENV DEBIAN_FRONTEND=noninteractive
-RUN apt update -y && apt upgrade -y && apt clean all -y
+RUN apt update -y && apt upgrade -y && \
+<%# TODO: Ubuntu 22.04 segfaults multiarch in GHA when libc-bin is upgraded %>
+<% if dist == 'ubuntu-22.04' && arch == 'aarch64' && ENV['GITHUB_ACTIONS'] == 'true' -%>
+    apt-mark hold libc-bin && \
+<% end -%>
+    apt clean all -y
 RUN apt update -y && apt install -y locales && \
     echo "en_US UTF-8" >> /etc/locale.gen && locale-gen $LANG && \
     apt clean all -y

data/lib/ood_packaging/build_box.rb

@@ -12,7 +12,6 @@ class OodPackaging::BuildBox
   BASE_IMAGES = {
     'el8'          => 'almalinux:8',
     'el9'          => 'almalinux:9',
-    'ubuntu-20.04' => 'ubuntu:20.04',
     'ubuntu-22.04' => 'ubuntu:22.04',
     'ubuntu-24.04' => 'ubuntu:24.04',
     'debian-12'    => 'debian:12',
@@ -20,7 +19,6 @@ class OodPackaging::BuildBox
   }.freeze
 
   CODENAMES = {
-    'ubuntu-20.04' => 'focal',
     'ubuntu-22.04' => 'jammy',
     'ubuntu-24.04' => 'noble',
     'debian-12'    => 'bookworm'

data/lib/ood_packaging/tasks.rb

@@ -86,16 +86,6 @@ namespace :ood_packaging do
       Rake::Task['ood_packaging:package:internal'].invoke(t.name, args[:dist], args[:arch])
     end
 
-    desc 'Package cjose'
-    task :cjose, [:dist, :arch] do |t, args|
-      Rake::Task['ood_packaging:package:internal'].invoke(t.name, args[:dist], args[:arch])
-    end
-
-    desc 'Package mod_auth_openidc'
-    task :mod_auth_openidc, [:dist, :arch] do |t, args|
-      Rake::Task['ood_packaging:package:internal'].invoke(t.name, args[:dist], args[:arch])
-    end
-
     desc 'Package ondemand_exporter'
     task :ondemand_exporter, [:dist, :arch] do |t, args|
       Rake::Task['ood_packaging:package:internal'].invoke(t.name, args[:dist], args[:arch])

data/lib/ood_packaging/version.rb

@@ -2,7 +2,7 @@
 
 # Version code for OodPackaging
 module OodPackaging
-  VERSION = '0.16.1'
+  VERSION = '0.17.0'
   PACKAGE_VERSION = {
     'ondemand-release'        => {
       '(ubuntu|debian)' => '4.0.0',
@@ -12,12 +12,13 @@ module OodPackaging
       '(ubuntu|debian)' => '5',
       'default'         => '1-8'
     },
-    'ondemand-runtime'        => '4.0.1',
+    'ondemand-runtime'        => '4.0.3',
     'scl-utils'               => '2.0.3',
-    'passenger'               => '6.0.23',
-    'cjose'                   => '0.6.1',
-    'mod_auth_openidc'        => '2.4.14.1',
-    'ondemand_exporter'       => '0.10.0',
+    'passenger'               => {
+      '(ubuntu|debian)' => '6.0.23',
+      'default'         => '6.0.23-2'
+    },
+    'ondemand_exporter'       => '0.11.2',
     'ondemand-compute'        => {
       '(ubuntu|debian)' => '4.0.0',
       'default'         => '4.0.0'

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: ood_packaging
 version: !ruby/object:Gem::Version
-  version: 0.16.1
+  version: 0.17.0
 platform: ruby
 authors:
 - Trey Dockendorf
 - Jeff Ohrstrom
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-10 00:00:00.000000000 Z
+date: 2025-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -99,7 +99,7 @@ homepage: https://github.com/OSC/ondemand-packaging
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -115,7 +115,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.2.33
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Open OnDemand packaging library
 test_files: []