ood_packaging 0.7.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f902be5bab3b459fc0789ec91c2b87703f14a1bc257ae574f573d5de56fa6d0e
-  data.tar.gz: c7adb05ed982192125609219c162cde9529f55278e33be200ff147f69bf12709
+  metadata.gz: 8d66aca5d9123c4952b9a2842fdc3c63aed8e566bf7f5e9569ce197bccbd3eaf
+  data.tar.gz: bb3382c9d597c60585aa35eb6305005e447e02c558b5a30ccc78bee625291c4a
 SHA512:
-  metadata.gz: 19a51eeee26b076a25aabf6f945303ba3f8fe7550288f464ef6fe09aa92aaffb6614aae0443b8879ce50f17ae25eafd8c82538c4252f71b6a460e285d157cb72
-  data.tar.gz: 6e91374166d46d6d5cea75e518095209f0e74cd5607a0978095ab0c06da79979ef47ca93b4474aeb1370df8aaaa290fa24459d9c96ef1922377fdfb3e960f00d
+  metadata.gz: 897f586443e3a39a868d2565dc12320bcd416f45d3fe8f26580024179c7b11ef357a8078e681e738ecfcd19b505cbecdea3dee1bb4c8d593b749bc6e03f578d1
+  data.tar.gz: 3531b9092f90394d950baeeeaa4cf4980eaf6163575953846f75688876c0a00109e4095bf2cc737e4236f3590fd1de2204cd59593e8ac82976512abbb527fb67

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
@@ -57,6 +57,12 @@ class OodPackaging::Build
     version.gsub(/^v/, '').gsub('-', '.')
   end
 
+  def deb_chlog_version
+    return "#{deb_version}-#{build_box.codename}" if config[:codename_version]
+
+    deb_version
+  end
+
   def rpm_defines
     defines = ["--define 'git_tag #{version}'"]
     defines.concat ["--define 'package_version #{rpm_version}'"]
@@ -110,11 +116,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
@@ -172,6 +178,7 @@ class OodPackaging::Build
     end
     puts "\tBootstrap work dir".blue
     sh "mkdir -p #{work_dir}/{RPMS,SRPMS,SOURCES,SPECS,rpmbuild/BUILD}"
+    bootstrap_rpm_packages! if config[:bootstrap_packages]
     bootstrap_copy_source!
     bootstrap_get_source!
   end
@@ -183,6 +190,17 @@ class OodPackaging::Build
     sh "sudo rpm --import #{ENV['GPG_PUBKEY']}#{cmd_suffix}" if ENV['GPG_PUBKEY']
   end
 
+  def bootstrap_rpm_packages!
+    return if config[:bootstrap_packages].nil?
+
+    cmd = ['sudo', 'dnf'] if build_box.dnf?
+    cmd = ['sudo', 'yum'] unless build_box.dnf?
+    cmd.concat ['install', '-y']
+    cmd.concat config[:bootstrap_packages]
+    puts "\tBootstrapping additional packages".blue
+    sh cmd.join(' ')
+  end
+
   def bootstrap_copy_source!
     puts "\tCopy sources".blue
     if build_box.rpm?
@@ -225,7 +243,7 @@ class OodPackaging::Build
     puts "\tBootstrap debian build files".blue
     Dir.chdir(deb_work_dir) do
       sh "dh_make -s -y --createorig -f ../#{deb_name}.tar.gz#{cmd_suffix} || true"
-      sh "dch -b -v #{deb_version} --controlmaint 'Release #{deb_version}'#{cmd_suffix}"
+      sh "dch -b -v #{deb_chlog_version} --controlmaint 'Release #{deb_chlog_version}'#{cmd_suffix}"
     end
   end
 

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
@@ -14,18 +15,18 @@ RUN rm -f /etc/yum.repos.d/CentOS-Vault.repo /etc/yum.repos.d/CentOS-Sources.rep
 RUN head -n 13 /etc/yum.repos.d/CentOS-SCLo-scl.repo > /etc/yum.repos.d/CentOS-SCLo.repo
 RUN head -n 13 /etc/yum.repos.d/CentOS-SCLo-scl-rh.repo >> /etc/yum.repos.d/CentOS-SCLo.repo
 RUN rm -f /etc/yum.repos.d/CentOS-SCLo-scl-rh.repo /etc/yum.repos.d/CentOS-SCLo-scl.repo
-<% elsif dist =~ /^el/ -%>
+<% elsif dnf? -%>
 RUN dnf update -y && dnf clean all && rm -rf /var/cache/dnf/*
-RUN dnf install -y dnf-utils 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-all-langpacks && 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/*
-<% else -%>
+<% elsif dist == 'el9' -%>
 RUN dnf config-manager --set-enabled crb && dnf clean all && rm -rf /var/cache/dnf/*
 <% end -%>
-RUN dnf install -y systemd ruby nodejs sudo which wget \
-    gcc-c++ gcc make patch \
-    rpm-build rpmdevtools rpm-sign scl-utils-build && \
+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' : '' %> && \
     dnf clean all && rm -rf /var/cache/dnf/*
 <% elsif dist =~ /^ubuntu|debian/ -%>
 ENV DEBIAN_FRONTEND=noninteractive

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

@@ -20,7 +20,7 @@ header "Add OnDemand build repo"
 cat > /etc/yum.repos.d/ondemand-web.repo <<EOF
 [ondemand-web]
 name=Open OnDemand Web Repo
-baseurl=https://yum.osc.edu/ondemand/build/<%= ondemand_repo_version %>/web/el\$releasever/\$basearch/
+baseurl=<%= ondemand_rpm_repo_baseurl %>
 enabled=1
 gpgcheck=0
 EOF
@@ -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

@@ -14,7 +14,8 @@ class OodPackaging::BuildBox
     'el8'          => 'rockylinux/rockylinux:8',
     'el9'          => 'almalinux:9',
     'ubuntu-20.04' => 'ubuntu:20.04',
-    'ubuntu-22.04' => 'ubuntu:22.04'
+    'ubuntu-22.04' => 'ubuntu:22.04',
+    'amzn2023'     => 'amazonlinux:2023'
   }.freeze
 
   CODENAMES = {
@@ -22,6 +23,11 @@ class OodPackaging::BuildBox
     'ubuntu-22.04' => 'jammy'
   }.freeze
 
+  ARCH_PLATFORMS = {
+    'x86_64'  => 'linux/amd64',
+    'aarch64' => 'linux/arm64'
+  }.freeze
+
   def initialize(config = {})
     @config = config
     raise ArgumentError, 'Must provide dist' if dist.nil?
@@ -30,6 +36,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
 
@@ -37,8 +46,12 @@ 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?('el') || dist.start_with?('amzn')
   end
 
   def deb?
@@ -79,6 +92,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
@@ -87,10 +108,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
@@ -108,7 +137,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
@@ -127,10 +156,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 = [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

@@ -276,6 +276,7 @@ class OodPackaging::Package
 
   def container_start!
     cmd = [container_runtime, 'run', '--detach', '--rm']
+    cmd.concat ['--platform', build_box.platform]
     cmd.concat ['--name', container_name]
     cmd.concat rt_specific_flags
     cmd.concat container_mounts
@@ -313,11 +314,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,71 +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-release'
-    task :'ondemand-runtime', [:dist] do |t, args|
-      Rake::Task['ood_packaging:package:internal'].invoke(t.name, args[:dist])
+    desc 'Package ondemand-runtime'
+    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, :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/utils.rb

@@ -58,6 +58,10 @@ module OodPackaging::Utils
     '3.1'
   end
 
+  def ondemand_rpm_repo_baseurl
+    "https://yum.osc.edu/ondemand/build/#{ondemand_repo_version}/web/#{dist}/\\$basearch/"
+  end
+
   def ruby_version
     '3.0'
   end

data/lib/ood_packaging/version.rb

@@ -2,7 +2,7 @@
 
 # Version code for OodPackaging
 module OodPackaging
-  VERSION = '0.7.0'
+  VERSION = '0.9.0'
   PACKAGE_VERSION = {
     'ondemand-release'        => {
       '(ubuntu|debian)' => '3.1.0',
@@ -10,14 +10,15 @@ module OodPackaging
     },
     'ondemand-release-latest' => {
       '(ubuntu|debian)' => '1',
-      'default'         => '1-7'
+      'default'         => '1-8'
     },
-    'ondemand-runtime'        => '3.1.0',
-    'passenger'               => '6.0.14',
+    'ondemand-runtime'        => '3.1.2',
+    'scl-utils'               => '2.0.3',
+    'passenger'               => '6.0.17',
     'cjose'                   => '0.6.1',
-    'mod_auth_openidc'        => '2.4.5',
+    '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.7.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Trey Dockendorf
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-29 00:00:00.000000000 Z
+date: 2023-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake