ood_packaging 0.8.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d301aee2821f7e83dbf3caf625871a3d8d938e5280ce8cdf092257dbd764d5f7
-  data.tar.gz: fe564b821d0cc7c8a5a094f4b110aee8c5e0a4ebf5d073cb8bd93cdc88ded585
+  metadata.gz: bfd4871399685168cb1e47dfdd31c283e203cd1c2c48b573d385379e536c4297
+  data.tar.gz: 392e1e6137c8564004b05d6ad142b37132e927302f94f9ef53245a6fe2695160
 SHA512:
-  metadata.gz: 3b91c002309b28ccf7266b44502689fc888d225ae8682e5c8a3374f2ff77bff6ffd28cf64dacd526253cc69fecef1fc7a59d3c24c73cdcbbacd3eb5374018097
-  data.tar.gz: 0d2c3272f19de52cd1f30f4b956193c497e8ef2186b0a0bf36cac0d670f9368fc80f988bf4d389774e46198c80b78529bd00fc4a4ffa344c6efcaaf8d74185dc
+  metadata.gz: da5b298b43c9e18150d7bbcae2ca4f540ac7583db5475336536a4f123375ce1f030570b9ce655063d573047f4a259ddb925e92c9d491fb5da2d95098cf934972
+  data.tar.gz: 3368909d19738083dabef1f28d39bbbdd16013a0d653bd3580b535253e475357aebf520af82e726fd8c782ebf1cac31a2259723d73220af5518575c0cc219792

data/bin/ood_packaging

@@ -22,6 +22,10 @@ OptionParser.new do |opts|
     options[:dist] = v
   end
 
+  opts.on('-a', '--arch=ARCH', String, 'Architecture to build') do |v|
+    options[:arch] = v
+  end
+
   opts.on('-V', '--version=VERSION', String, 'Version of package to build') do |v|
     options[:version] = v
   end

data/lib/ood_packaging/build.rb

@@ -15,7 +15,7 @@ class OodPackaging::Build
   attr_accessor :build_box
 
   def initialize
-    @build_box = OodPackaging::BuildBox.new(dist: ENV['DIST'])
+    @build_box = OodPackaging::BuildBox.new(dist: ENV['DIST'], arch: ENV['ARCH'])
   end
 
   def config
@@ -39,7 +39,10 @@ class OodPackaging::Build
   end
 
   def version
-    ENV['VERSION']
+    ver = ENV['VERSION']
+    return nil if ver == ''
+
+    ver
   end
 
   def rpm_version
@@ -47,6 +50,8 @@ class OodPackaging::Build
   end
 
   def rpm_release
+    return nil if version.nil?
+
     v = version.split('-', 2)
     return '1' if v.size < 2
 
@@ -64,9 +69,10 @@ class OodPackaging::Build
   end
 
   def rpm_defines
-    defines = ["--define 'git_tag #{version}'"]
-    defines.concat ["--define 'package_version #{rpm_version}'"]
-    defines.concat ["--define 'package_release #{rpm_release}'"]
+    defines = []
+    defines.concat ["--define 'git_tag #{version}'"] unless version.nil?
+    defines.concat ["--define 'package_version #{rpm_version}'"] unless rpm_version.nil?
+    defines.concat ["--define 'package_release #{rpm_release}'"] unless rpm_release.nil?
     defines.concat ["--define 'scl #{config[:scl]}'"] if config[:scl]
     defines
   end
@@ -116,11 +122,11 @@ class OodPackaging::Build
   end
 
   def output_dir
-    File.join('/output', build_box.dist)
+    File.join('/output', "#{build_box.dist}-#{build_box.arch}")
   end
 
   def work_dir
-    File.join('/work', build_box.dist)
+    build_box.work_dir
   end
 
   def packaging_config

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

@@ -1,4 +1,5 @@
-FROM <%= base_image %>
+FROM --platform=<%= platform %> <%= base_image %>
+ENV ARCH=<%= arch %> 
 MAINTAINER Trey Dockendorf <tdockendorf@osc.edu>
 ENV LANG=en_US.UTF-8
 ENV LC_CTYPE=en_US.UTF-8
@@ -16,7 +17,7 @@ RUN head -n 13 /etc/yum.repos.d/CentOS-SCLo-scl-rh.repo >> /etc/yum.repos.d/Cent
 RUN rm -f /etc/yum.repos.d/CentOS-SCLo-scl-rh.repo /etc/yum.repos.d/CentOS-SCLo-scl.repo
 <% elsif dnf? -%>
 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-all-langpacks && 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/*
@@ -36,8 +37,10 @@ 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 arch != 'ppc64le' %>
 RUN echo "deb https://deb.nodesource.com/node_<%= nodejs_version %>.x <%= codename %> main" > /etc/apt/sources.list.d/nodesource.list
 RUN curl -s https://deb.nodesource.com/gpgkey/nodesource.gpg.key | gpg --dearmor > /etc/apt/trusted.gpg.d/nodesource.gpg
+<% end %>
 <% end -%>
 COPY . /build
 RUN /bin/bash /build/install.sh

data/lib/ood_packaging/build_box/docker-image/install.sh.erb

@@ -45,7 +45,7 @@ run chmod 440 /etc/sudoers.d/ood
 <% if rpm? -%>
 header "Setup RPM env"
 sudo -u <%= ctr_user %> -H cat > <%= ctr_rpmmacros %> <<EOF
-%_topdir /work/<%= dist %>
+%_topdir <%= work_dir %>
 <%- # Workaround to weird issue with debuginfo stripping -%>
 <% if dist == 'el7' -%>
 %_builddir %{_topdir}/rpmbuild/BUILD

data/lib/ood_packaging/build_box.rb

@@ -11,7 +11,7 @@ class OodPackaging::BuildBox
 
   BASE_IMAGES = {
     'el7'          => 'centos:7',
-    'el8'          => 'rockylinux/rockylinux:8',
+    'el8'          => 'almalinux:8',
     'el9'          => 'almalinux:9',
     'ubuntu-20.04' => 'ubuntu:20.04',
     'ubuntu-22.04' => 'ubuntu:22.04',
@@ -23,6 +23,12 @@ class OodPackaging::BuildBox
     'ubuntu-22.04' => 'jammy'
   }.freeze
 
+  ARCH_PLATFORMS = {
+    'x86_64'  => 'linux/amd64',
+    'aarch64' => 'linux/arm64',
+    'ppc64le' => 'linux/ppc64le'
+  }.freeze
+
   def initialize(config = {})
     @config = config
     raise ArgumentError, 'Must provide dist' if dist.nil?
@@ -31,6 +37,9 @@ class OodPackaging::BuildBox
     unless valid_dist?(dist)
       raise ArgumentError, "Invalid dist selected: #{dist}. Valid choices are #{valid_dists.join(' ')}"
     end
+    unless valid_arch?(arch)
+      raise ArgumentError, "Invalid arch selected: #{arch}. Valid choices are #{valid_arches.join(' ')}"
+    end
     # rubocop:enable Style/GuardClause
   end
 
@@ -38,6 +47,10 @@ class OodPackaging::BuildBox
     @dist ||= ENV['OOD_PACKAGING_DIST'] || @config[:dist]
   end
 
+  def arch
+    @arch ||= ENV['OOD_PACKAGING_ARCH'] || @config[:arch] || 'x86_64'
+  end
+
   def rpm?
     dist.start_with?('el') || dist.start_with?('amzn')
   end
@@ -80,6 +93,14 @@ class OodPackaging::BuildBox
     BASE_IMAGES.keys
   end
 
+  def valid_arch?(value)
+    ARCH_PLATFORMS.key?(value)
+  end
+
+  def valid_arches
+    ARCH_PLATFORMS.keys
+  end
+
   def base_image
     @base_image ||= BASE_IMAGES[dist]
   end
@@ -88,10 +109,18 @@ class OodPackaging::BuildBox
     @codename ||= CODENAMES[dist]
   end
 
+  def platform
+    @platform ||= ARCH_PLATFORMS[arch]
+  end
+
   def build_dir
     File.join(File.dirname(__FILE__), 'build_box/docker-image')
   end
 
+  def work_dir
+    File.join('/work', "#{dist}-#{arch}")
+  end
+
   def image_registry
     @config[:build_box_registry] || ENV['OOD_PACKAGING_BUILD_BOX_REGISTRY'] || nil
   end
@@ -109,7 +138,7 @@ class OodPackaging::BuildBox
   end
 
   def image_tag
-    [image_registry, image_org, "#{image_name}-#{dist}:#{image_version}"].compact.join('/')
+    [image_registry, image_org, "#{image_name}-#{dist}-#{arch}:#{image_version}"].compact.join('/')
   end
 
   def build_gem
@@ -128,11 +157,29 @@ class OodPackaging::BuildBox
     template_file('build_box/docker-image/install.sh.erb')
   end
 
+  def build_command
+    if container_runtime == 'docker'
+      ['buildx', 'build']
+    else
+      ['build']
+    end
+  end
+
+  def build_output
+    if container_runtime == 'docker'
+      ['--output', 'type=docker']
+    else
+      []
+    end
+  end
+
   def build!
     scripts
-    cmd = [container_runtime, 'build']
-    cmd.concat ['--platform', 'linux/amd64']
+    cmd = [container_runtime]
+    cmd.concat build_command
+    cmd.concat ['--platform', platform]
     cmd.concat ['--tag', image_tag]
+    cmd.concat build_output
     cmd.concat [ENV['OOD_PACKAGING_BUILD_BOX_ARGS']] if ENV['OOD_PACKAGING_BUILD_BOX_ARGS']
     cmd.concat ['-f', dockerfile]
     cmd.concat [build_dir]

data/lib/ood_packaging/options.rb

@@ -2,7 +2,7 @@
 
 # Handle options for OodPackaging
 module OodPackaging
-  OPTIONS = [:package, :version, :dist, :work_dir, :clean_work_dir, :output_dir, :clean_output_dir, :tar,
+  OPTIONS = [:package, :version, :dist, :arch, :work_dir, :clean_work_dir, :output_dir, :clean_output_dir, :tar,
              :tar_only, :skip_download, :gpg_sign, :gpg_name, :gpg_pubkey, :gpg_private_key, :gpg_passphrase,
              :debug, :attach].freeze
 end

data/lib/ood_packaging/package.rb

@@ -248,7 +248,20 @@ class OodPackaging::Package
     end
   end
 
+  # Unused but left in case useful in future
+  # def handle_signals
+  #   ['QUIT', 'TERM', 'INT'].each do |signal|
+  #     Signal.trap(signal) do
+  #       puts "Caught signal #{signal}, proceeding to kill container".red
+  #       container_kill!
+  #       exit 1
+  #     end
+  #   end
+  # end
+
+  # rubocop:disable Metrics/AbcSize
   def run!
+    # handle_signals
     if tar_only?
       tar!
       return
@@ -259,6 +272,10 @@ class OodPackaging::Package
     container_start!
     container_exec!(exec_rake)
     puts "Build SUCCESS: package=#{package} dist=#{build_box.dist}".green
+  rescue SignalException => e
+    puts "Caught signal #{e}, proceeding to kill container".red
+    container_kill!
+    exit 1
   rescue RuntimeError
     puts "Build FAILED package=#{package} dist=#{build_box.dist}".red
     raise
@@ -266,6 +283,7 @@ class OodPackaging::Package
     container_attach! if attach?
     container_kill! if container_running? && !attach?
   end
+  # rubocop:enable Metrics/AbcSize
 
   def container_running?
     cmd = "#{container_runtime} inspect #{container_name} 2>/dev/null 1>/dev/null"
@@ -276,7 +294,7 @@ class OodPackaging::Package
 
   def container_start!
     cmd = [container_runtime, 'run', '--detach', '--rm']
-    cmd.concat ['--platform', 'linux/amd64']
+    cmd.concat ['--platform', build_box.platform]
     cmd.concat ['--name', container_name]
     cmd.concat rt_specific_flags
     cmd.concat container_mounts
@@ -314,11 +332,14 @@ class OodPackaging::Package
     cmd = [container_runtime, 'kill', container_name]
     cmd.concat [cmd_suffix] unless debug?
     sh cmd.join(' '), verbose: debug?
+  rescue RuntimeError
+    puts 'Error killing container'.red
   end
 
   def container_env
     env = {
       'DIST'          => build_box.dist,
+      'ARCH'          => build_box.arch,
       'PACKAGE'       => package_name,
       'VERSION'       => version,
       'TAR_NAME'      => "#{tar_name}.tar.gz",

data/lib/ood_packaging/tasks.rb

@@ -17,25 +17,25 @@ namespace :ood_packaging do
 
   namespace :buildbox do
     desc 'Build buildbox image'
-    task :build, [:dist] do |_task, args|
+    task :build, [:dist, :arch] do |_task, args|
       @build_box = OodPackaging::BuildBox.new(args)
       @build_box.build!
     end
 
     desc 'Push buildbox image'
-    task :push, [:dist] do |_task, args|
+    task :push, [:dist, :arch] do |_task, args|
       @build_box = OodPackaging::BuildBox.new(args)
       @build_box.push!
     end
 
     desc 'Pull buildbox image'
-    task :pull, [:dist] do |_task, args|
+    task :pull, [:dist, :arch] do |_task, args|
       @build_box = OodPackaging::BuildBox.new(args)
       @build_box.pull!
     end
 
     desc 'Save buildbox image'
-    task :save, [:dist, :path] do |_task, args|
+    task :save, [:dist, :arch, :path] do |_task, args|
       @build_box = OodPackaging::BuildBox.new(args)
       @build_box.save!(args[:path])
     end
@@ -47,76 +47,78 @@ namespace :ood_packaging do
       OodPackaging::Build.new.run!
     end
 
-    OodPackaging::RakeTask.new(:internal, [:package, :dist]) do |t, args|
+    OodPackaging::RakeTask.new(:internal, [:package, :dist, :arch]) do |t, args|
       name = args[:package].split(':').last
       t.package = File.join(proj_root, 'packages', name)
       dist = args[:dist] || ENV['OOD_PACKAGING_DIST']
+      arch = args[:arch] || ENV['OOD_PACKAGING_ARCH'] || 'x86_64'
       t.dist = dist
+      t.arch = arch
       t.version = OodPackaging.package_version(name, dist)
       t.work_dir = File.join(proj_root, 'tmp/work')
       t.output_dir = File.join(proj_root, 'tmp/output')
     end
 
     desc 'Package ondemand-release'
-    task :'ondemand-release', [:dist] do |t, args|
+    task :'ondemand-release', [:dist, :arch] do |t, args|
       ENV['OOD_PACKAGING_GPG_SIGN'] = 'false'
-      Rake::Task['ood_packaging:package:internal'].invoke(t.name, args[:dist])
+      Rake::Task['ood_packaging:package:internal'].invoke(t.name, args[:dist], args[:arch])
     end
 
     desc 'Package ondemand-release-latest'
-    task :'ondemand-release-latest', [:dist] do |t, args|
+    task :'ondemand-release-latest', [:dist, :arch] do |t, args|
       ENV['OOD_PACKAGING_GPG_SIGN'] = 'false'
-      Rake::Task['ood_packaging:package:internal'].invoke(t.name, args[:dist])
+      Rake::Task['ood_packaging:package:internal'].invoke(t.name, args[:dist], args[:arch])
     end
 
     desc 'Package ondemand-runtime'
-    task :'ondemand-runtime', [:dist] do |t, args|
-      Rake::Task['ood_packaging:package:internal'].invoke(t.name, args[:dist])
+    task :'ondemand-runtime', [:dist, :arch] do |t, args|
+      Rake::Task['ood_packaging:package:internal'].invoke(t.name, args[:dist], args[:arch])
     end
 
     desc 'Package scl-utils'
-    task :'scl-utils', [:dist] do |t, args|
-      Rake::Task['ood_packaging:package:internal'].invoke(t.name, args[:dist])
+    task :'scl-utils', [:dist, :arch] do |t, args|
+      Rake::Task['ood_packaging:package:internal'].invoke(t.name, args[:dist], args[:arch])
     end
 
     desc 'Package passenger'
-    task :passenger, [:dist] do |t, args|
-      Rake::Task['ood_packaging:package:internal'].invoke(t.name, args[:dist])
+    task :passenger, [:dist, :arch] do |t, args|
+      Rake::Task['ood_packaging:package:internal'].invoke(t.name, args[:dist], args[:arch])
     end
 
     desc 'Package cjose'
-    task :cjose, [:dist] do |t, args|
-      Rake::Task['ood_packaging:package:internal'].invoke(t.name, args[:dist])
+    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] do |t, args|
-      Rake::Task['ood_packaging:package:internal'].invoke(t.name, args[:dist])
+    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 sqlite'
-    task :sqlite, [:dist] do |t, args|
-      Rake::Task['ood_packaging:package:internal'].invoke(t.name, args[:dist])
+    task :sqlite, [: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] do |t, args|
-      Rake::Task['ood_packaging:package:internal'].invoke(t.name, args[:dist])
+    task :ondemand_exporter, [:dist, :arch] do |t, args|
+      Rake::Task['ood_packaging:package:internal'].invoke(t.name, args[:dist], args[:arch])
     end
 
     desc 'Package ondemand-compute'
-    task :'ondemand-compute', [:dist] do |t, args|
-      Rake::Task['ood_packaging:package:internal'].invoke(t.name, args[:dist])
+    task :'ondemand-compute', [:dist, :arch] do |t, args|
+      Rake::Task['ood_packaging:package:internal'].invoke(t.name, args[:dist], args[:arch])
     end
 
     desc 'Package python-websockify'
-    task :'python-websockify', [:dist] do |t, args|
-      Rake::Task['ood_packaging:package:internal'].invoke(t.name, args[:dist])
+    task :'python-websockify', [:dist, :arch] do |t, args|
+      Rake::Task['ood_packaging:package:internal'].invoke(t.name, args[:dist], args[:arch])
     end
 
     desc 'Package turbovnc'
-    task :turbovnc, [:dist] do |t, args|
-      Rake::Task['ood_packaging:package:internal'].invoke(t.name, args[:dist])
+    task :turbovnc, [:dist, :arch] do |t, args|
+      Rake::Task['ood_packaging:package:internal'].invoke(t.name, args[:dist], args[:arch])
     end
   end
 end

data/lib/ood_packaging/version.rb

@@ -2,7 +2,7 @@
 
 # Version code for OodPackaging
 module OodPackaging
-  VERSION = '0.8.0'
+  VERSION = '0.10.0'
   PACKAGE_VERSION = {
     'ondemand-release'        => {
       '(ubuntu|debian)' => '3.1.0',
@@ -12,13 +12,13 @@ module OodPackaging
       '(ubuntu|debian)' => '1',
       'default'         => '1-8'
     },
-    'ondemand-runtime'        => '3.1.1',
+    'ondemand-runtime'        => '3.1.2',
     'scl-utils'               => '2.0.3',
     'passenger'               => '6.0.17',
     'cjose'                   => '0.6.1',
     'mod_auth_openidc'        => '2.4.14.1',
     'sqlite'                  => '3.26.0-4',
-    'ondemand_exporter'       => '0.9.0',
+    'ondemand_exporter'       => '0.10.0',
     'ondemand-compute'        => {
       '(ubuntu|debian)' => '3.1.0',
       'default'         => '3.1.0'

metadata

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