ood_packaging 0.0.1.r2.0 → 0.0.1.rc.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '08137cd4ccfc377bfd70ad3ef9f10b1af265f873397323848fab54c546ae0e5e'
-  data.tar.gz: d180ca4601d18558d9d37e607fb1ac5c27406d893709bd2cd1c837565140c834
+  metadata.gz: d76f705e0592bc694ee1e658e75da269f269489712392b3a412bc7db7ab566e7
+  data.tar.gz: c8eb63270d72d241ae87b1b82d9daeb1bb78382d529d636637fb2c8db1c5d9cb
 SHA512:
-  metadata.gz: 37002fb96167b8310a3cb42bd6a3d4980ba0410d96b8eb3921e44de456a481c2f6c07f6dfda1b02da960043e12bfa0b474eac4fc2dda89021c9f0ff04610e7ed
-  data.tar.gz: e93b9c5b83b07637220354dedf9b17acdabaee8f53c2b9225ff9ac4adf7034c4b10c94ed2497a468f516a7c393094d04df6ff5b4091802648597fa4948241f4a
+  metadata.gz: 6abb5c9b384d917d91570578518be7f53a3b28568f4fa6bf50568d7903b7eae916b62be9b32e37607302f7227b1af3c1b811679b2ce17d05243c2b52503b224b
+  data.tar.gz: fb24936ba8e69d351b00032b5afe02fc3520629ea694d91a068bad906185275d0d2ce1a5c65a206ded893e70b1992c7dcae92378d0aa8959aed270486696f6a1

data/bin/ood_packaging

@@ -2,9 +2,13 @@
 # frozen_string_literal: true
 
 require 'optparse'
-libdir = File.expand_path(File.join(__dir__, '../lib'))
-$LOAD_PATH.unshift(libdir) if Dir.exist?(libdir)
-require 'ood_packaging'
+begin
+  require 'ood_packaging'
+# If gem is not installed, load from location in git repo
+rescue LoadError
+  $LOAD_PATH.unshift(File.expand_path(File.join(__dir__, '../lib')))
+  require 'ood_packaging'
+end
 
 options = {}
 OptionParser.new do |opts|

data/lib/ood_packaging/build.rb

@@ -39,11 +39,11 @@ class OodPackaging::Build
   end
 
   def version
-    ENV['VERSION']
+    ENV['VERSION'].gsub(/^v/, '')
   end
 
   def rpm_version
-    version.gsub(/^v/, '').split('-', 2)[0]
+    version.split('-', 2)[0]
   end
 
   def rpm_release
@@ -53,12 +53,8 @@ class OodPackaging::Build
     v[1].gsub('-', '.')
   end
 
-  def deb_version
-    version.gsub(/^v/, '').gsub('-', '.')
-  end
-
   def rpm_defines
-    defines = ["--define 'git_tag #{version}'"]
+    defines = ["--define 'git_tag #{ENV['VERSION']}'"]
     defines.concat ["--define 'package_version #{rpm_version}'"]
     defines.concat ["--define 'package_release #{rpm_release}'"]
     defines.concat ["--define 'scl #{config[:scl]}'"] if config[:scl]
@@ -76,8 +72,6 @@ class OodPackaging::Build
                     '/package/rpm'
                   elsif Dir.exist?('/package/packaging/rpm')
                     '/package/packaging/rpm'
-                  elsif Dir.exist?('/package/packaging')
-                    '/package/packaging'
                   else
                     '/package'
                   end
@@ -94,8 +88,6 @@ class OodPackaging::Build
   def debian_dir
     @debian_dir ||= if Dir.exist?('/package/deb/debian')
                       '/package/deb/debian'
-                    elsif Dir.exist?('/package/packaging/deb')
-                      '/package/packaging/deb'
                     else
                       '/package/debian'
                     end
@@ -130,7 +122,7 @@ class OodPackaging::Build
   end
 
   def deb_name
-    "#{package}-#{deb_version}"
+    "#{package}-#{version}"
   end
 
   def rpms
@@ -138,7 +130,6 @@ class OodPackaging::Build
   end
 
   def run!
-    fix_env!
     env_dump! if debug?
     bootstrap_rpm! if build_box.rpm?
     bootstrap_deb! if build_box.deb?
@@ -150,10 +141,6 @@ class OodPackaging::Build
     sanity!
   end
 
-  def fix_env!
-    ENV.delete('GEM_PATH')
-  end
-
   def env_dump!
     ENV.sort.to_h.each_pair do |k, v|
       puts "#{k}=#{v}"
@@ -194,17 +181,10 @@ class OodPackaging::Build
   def bootstrap_get_source!
     if ENV['SKIP_DOWNLOAD'] == 'true'
       puts "\tSKIP_DOWNLOAD detected, skipping download sources".blue
-      return
-    end
-    output = `spectool #{rpm_defines.join(' ')} -l -R -S #{spec_file} 2>&1 | grep 'Source0:'`.strip
-    exit_code = $CHILD_STATUS.exitstatus
-    if exit_code.zero?
-      source = File.join(work_dir, 'SOURCES', File.basename(output))
-      tar = File.join(work_dir, 'SOURCES', ENV['TAR_NAME'])
-      sh "mv #{tar} #{source}" if !File.exist?(source) && File.exist?(tar)
+    else
+      puts "\tDownloading sources defined in #{spec_file}".blue
+      sh "spectool #{rpm_defines.join(' ')} -g -R -S #{spec_file}#{cmd_suffix}"
     end
-    puts "\tDownloading sources defined in #{spec_file}".blue
-    sh "spectool #{rpm_defines.join(' ')} -g -R -S #{spec_file}#{cmd_suffix}"
   end
 
   def bootstrap_deb!
@@ -221,7 +201,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 #{version} 'Release #{version}'#{cmd_suffix}"
     end
   end
 
@@ -247,14 +227,9 @@ class OodPackaging::Build
 
   def install_deb_dependencies!
     sh "sudo apt update -y#{cmd_suffix}"
-    tool = [
-      'DEBIAN_FRONTEND=noninteractive apt-cudf-get --solver aspcud',
-      '-o APT::Get::Assume-Yes=1 -o APT::Get::Allow-Downgrades=1',
-      '-o Debug::pkgProblemResolver=0 -o APT::Install-Recommends=0'
-    ]
     cmd = [
       'mk-build-deps --install --remove --root-cmd sudo',
-      "--tool='#{tool.join(' ')}'"
+      "--tool='apt-get -o Debug::pkgProblemResolver=yes --no-install-recommends --yes'"
     ]
     Dir.chdir(deb_work_dir) do
       sh "#{cmd.join(' ')}#{cmd_suffix}"

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

@@ -2,35 +2,31 @@ FROM <%= base_image %>
 MAINTAINER Trey Dockendorf <tdockendorf@osc.edu>
 ENV LANG=en_US.UTF-8
 ENV LC_CTYPE=en_US.UTF-8
-ENV USER=<%= ctr_user %>
-ENV GEM_PATH=<%= ctr_gems_dir %>:
-<% if scl? -%>
+<% if dist == 'el7' -%>
 RUN yum update -y && yum clean all && rm -rf /var/cache/yum/*
 RUN yum install -y yum-utils epel-release centos-release-scl && yum clean all && rm -rf /var/cache/yum/*
 RUN yum install -y <%= scl_ruby %>-ruby sudo which wget @buildsys-build \
     rpm-build rpmdevtools rpm-sign scl-utils-build && \
     yum clean all && rm -rf /var/cache/yum/*
-RUN rm -f /etc/yum.repos.d/CentOS-Vault.repo /etc/yum.repos.d/CentOS-Sources.repo
-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 dnf? -%>
+<% elsif dist =~ /^el/ -%>
 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 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/*
-RUN dnf install -y systemd ruby nodejs sudo which wget \
+RUN dnf module enable -y ruby:<%= ruby_version %> && dnf clean all && rm -rf /var/cache/dnf/*
+RUN dnf module enable -y nodejs:<%= nodejs_version %> && dnf clean all && rm -rf /var/cache/dnf/*
+RUN dnf install -y ruby sudo which wget \
     gcc-c++ gcc make patch \
     rpm-build rpmdevtools rpm-sign scl-utils-build && \
     dnf clean all && rm -rf /var/cache/dnf/*
-<% elsif deb? -%>
+<% elsif dist =~ /^ubuntu|debian/ -%>
 ENV DEBIAN_FRONTEND=noninteractive
 RUN apt update -y && apt upgrade -y && apt clean all -y
 RUN apt update -y && apt install -y locales && locale-gen $LANG && \
     apt clean all -y
 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 && \
+    init debhelper devscripts dh-make build-essential lintian equivs \
+    sudo rake wget curl ruby && \
+    ln -snf /bin/bundle2.7 /bin/bundle && \
     apt clean all -y
 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

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

@@ -72,10 +72,10 @@ echo "allow-loopback-pinentry" >> <%= ctr_gpg_dir %>/gpg-agent.conf
 <%- end -%>
 
 header "Install ood_packaging gem"
-<%- if scl? -%>
-run scl enable <%= scl_ruby %> -- gem install --no-doc --bindir <%= ctr_scripts_dir %> --install-dir <%= ctr_gems_dir %> /build/*.gem
+<%- if rpm? && !dnf? -%>
+run scl enable <%= scl_ruby %> -- gem install --no-doc /build/*.gem
 <%- else -%>
-run gem install --no-doc --bindir <%= ctr_scripts_dir %> --install-dir <%= ctr_gems_dir %> /build/*.gem
+run gem install --no-doc /build/*.gem
 <%- end -%>
 
 header "Copy in launch scripts"

data/lib/ood_packaging/build_box.rb

@@ -21,17 +21,17 @@ class OodPackaging::BuildBox
 
   def initialize(config = {})
     @config = config
-    raise ArgumentError, 'Must provide dist' if dist.nil?
+    raise ArgumentError, 'Must provide dist' if @config[:dist].nil?
 
     # rubocop:disable Style/GuardClause
-    unless valid_dist?(dist)
-      raise ArgumentError, "Invalid dist selected: #{dist}. Valid choices are #{valid_dists.join(' ')}"
+    unless valid_dist?(@config[:dist])
+      raise ArgumentError, "Invalid dist selected: #{@config[:dist]}. Valid choices are #{valid_dists.join(' ')}"
     end
     # rubocop:enable Style/GuardClause
   end
 
   def dist
-    @dist ||= ENV['OOD_PACKAGING_DIST'] || @config[:dist]
+    @dist ||= @config[:dist]
   end
 
   def rpm?
@@ -95,7 +95,7 @@ class OodPackaging::BuildBox
   end
 
   def image_version
-    (ENV['OOD_PACKAGING_BUILD_BOX_VERSION'] || OodPackaging::VERSION).gsub(/^v/, '')
+    ENV['OOD_PACKAGING_BUILD_BOX_VERSION'] || OodPackaging::VERSION
   end
 
   def image_tag
@@ -133,10 +133,6 @@ class OodPackaging::BuildBox
     sh [container_runtime, 'push', image_tag].join(' ')
   end
 
-  def pull!
-    sh [container_runtime, 'pull', image_tag].join(' ')
-  end
-
   def save!(path)
     sh [container_runtime, 'save', image_tag, '| gzip >', path].join(' ')
   end

data/lib/ood_packaging/package.rb

@@ -21,6 +21,8 @@ class OodPackaging::Package
     @config = config
     @config[:dist] = 'el8' if tar_only?
     @build_box = OodPackaging::BuildBox.new(config)
+    @clean_work_dir = config[:clean_work_dir].nil? ? true : config[:clean_work_dir]
+    @clean_output_dir = config[:clean_output_dir].nil? ? true : config[:clean_output_dir]
     raise ArgumentError, 'Package is required' if package.nil?
     raise ArgumentError, 'Version is required' if version.nil?
     raise ArgumentError, "Package #{package} is not a directory" unless Dir.exist?(package)
@@ -31,18 +33,12 @@ class OodPackaging::Package
     @container_name ||= SecureRandom.uuid
   end
 
-  def debug?
+  def debug
     return true if ENV['OOD_PACKAGING_DEBUG'] == 'true'
 
     @config[:debug].nil? ? false : @config[:debug]
   end
 
-  def cmd_suffix
-    return '' if debug?
-
-    ' 2>/dev/null 1>/dev/null'
-  end
-
   def attach?
     return true if ENV['OOD_PACKAGING_ATTACH'] == 'true'
 
@@ -53,22 +49,10 @@ class OodPackaging::Package
     @work_dir ||= File.expand_path(@config[:work_dir])
   end
 
-  def clean_work_dir
-    return false if ENV['OOD_PACKAGING_CLEAN_WORK_DIR'] == 'false'
-
-    @config[:clean_work_dir].nil? ? true : @config[:clean_work_dir]
-  end
-
   def output_dir
     @output_dir ||= File.expand_path(@config[:output_dir])
   end
 
-  def clean_output_dir
-    return false if ENV['OOD_PACKAGING_CLEAN_OUTPUT_DIR'] == 'false'
-
-    @config[:clean_output_dir].nil? ? true : @config[:clean_output_dir]
-  end
-
   def package
     @config[:package]
   end
@@ -91,21 +75,20 @@ class OodPackaging::Package
 
   def package_name
     name = File.basename(package)
-    case name
-    when /deb|rpm/
+    if name =~ /deb|rpm/
       name = if File.basename(File.dirname(package)) == 'packages'
                File.basename(File.dirname(File.dirname(package)))
              else
                File.basename(File.dirname(package))
              end
-    when 'packaging'
-      name = File.basename(File.dirname(package))
     end
     name
   end
 
   def gpg_files
     [
+      OpenStruct.new(private_key: File.join(proj_root, 'ondemand.sec'), passphrase: File.join(proj_root, '.gpgpass')),
+      OpenStruct.new(private_key: File.join(package, 'ondemand.sec'), passphrase: File.join(package, '.gpgpass')),
       OpenStruct.new(private_key: @config[:gpg_private_key], passphrase: @config[:gpg_passphrase]),
       OpenStruct.new(private_key: ENV['OOD_PACKAGING_GPG_PRIVATE_KEY'],
                      passphrase:  ENV['OOD_PACKAGING_GPG_PASSPHRASE'])
@@ -123,12 +106,8 @@ class OodPackaging::Package
     !gpg_files.nil?
   end
 
-  def default_gpg_name
-    'OnDemand Release Signing Key'
-  end
-
   def gpg_name
-    @config[:gpg_name].nil? ? default_gpg_name : @config[:gpg_name]
+    @config[:gpg_name].nil? ? 'OnDemand Release Signing Key' : @config[:gpg_name]
   end
 
   def container_init
@@ -144,23 +123,10 @@ class OodPackaging::Package
     package
   end
 
-  def tar_name
-    version = if build_box.rpm?
-                rpm_version
-              else
-                deb_version
-              end
-    "#{package_name}-#{version}"
-  end
-
   def rpm_tar_dest_dir
-    [
-      File.join(package, 'rpm'),
-      File.join(package, 'packaging/rpm'),
-      File.join(package, 'packaging')
-    ].each do |dir|
-      return dir if Dir.exist?(dir)
-    end
+    dir = File.join(package, 'rpm')
+    return dir if Dir.exist?(dir)
+
     File.join(package, 'packaging/rpm')
   end
 
@@ -191,8 +157,8 @@ class OodPackaging::Package
     cmd = []
     cmd.concat exec_launchers if docker_runtime?
     cmd.concat ['scl', 'enable', scl_ruby, '--'] if podman_runtime? && build_box.scl?
-    cmd.concat [File.join(ctr_scripts_dir, 'rake')]
-    cmd.concat ['-q'] unless debug?
+    cmd.concat ['rake']
+    cmd.concat ['-q'] unless debug
     cmd.concat ['-f', File.join(ctr_scripts_dir, 'Rakefile'), 'ood_packaging:package:build']
     cmd
   end
@@ -218,31 +184,33 @@ class OodPackaging::Package
   end
 
   def clean!
-    sh "rm -rf #{work_dir}", verbose: debug? if clean_work_dir
-    sh "rm -rf #{output_dir}", verbose: debug? if clean_output_dir
+    sh "rm -rf #{work_dir}", verbose: debug if @clean_work_dir
+    sh "rm -rf #{output_dir}", verbose: debug if @clean_output_dir
   end
 
   def bootstrap!
-    sh "mkdir -p #{work_dir}", verbose: debug?
-    sh "mkdir -p #{output_dir}", verbose: debug?
+    sh "mkdir -p #{work_dir}", verbose: debug
+    sh "mkdir -p #{output_dir}", verbose: debug
   end
 
   def tar!
     cmd = ['git', 'ls-files', '.', '|', tar, '-c']
     if build_box.rpm?
       dir = rpm_tar_dest_dir
+      version = rpm_version
     else
       dir = deb_tar_dest_dir.tap { |p| sh "mkdir -p #{p}" }
+      version = deb_version
       cmd.concat ["--transform 'flags=r;s,packaging/deb,debian,'"]
     end
-    tar_file = "#{dir}/#{tar_name}.tar.gz"
-    cmd.concat ["--transform 's,^,#{tar_name}/,'"]
+    tar_file = "#{dir}/#{package_name}-#{version}.tar.gz"
+    cmd.concat ["--transform 's,^,#{package_name}-#{version}/,'"]
     cmd.concat ['-T', '-', '|', "gzip > #{tar_file}"]
 
     sh "rm #{tar_file}" if File.exist?(tar_file)
     puts "Create tar archive #{tar_file}".blue
     Dir.chdir(tar_path) do
-      sh cmd.join(' '), verbose: debug?
+      sh cmd.join(' '), verbose: debug
     end
   end
 
@@ -256,19 +224,19 @@ class OodPackaging::Package
     tar! if tar?
     container_start!
     container_exec!(exec_rake)
-    puts "Build SUCCESS: package=#{package} dist=#{build_box.dist}".green
   rescue RuntimeError
+    # ret = 1
     puts "Build FAILED package=#{package} dist=#{build_box.dist}".red
     raise
+  else
+    puts "Build SUCCESS: package=#{package} dist=#{build_box.dist}".green
   ensure
     container_exec!(exec_attach, ['-i', '-t']) if attach?
-    container_kill! if container_running? && !attach?
+    container_kill! if container_running?
   end
 
   def container_running?
-    cmd = "#{container_runtime} inspect #{container_name} 2>/dev/null 1>/dev/null"
-    puts cmd if debug?
-    `#{cmd}`
+    `#{container_runtime} inspect #{container_name} 2>/dev/null 1>/dev/null`
     $CHILD_STATUS.success?
   end
 
@@ -279,9 +247,9 @@ class OodPackaging::Package
     cmd.concat container_mounts
     cmd.concat [build_box.image_tag]
     cmd.concat [container_init]
-    cmd.concat ['1>/dev/null'] unless debug?
+    cmd.concat ['1>/dev/null'] unless debug
     puts "Starting container #{container_name} using image #{build_box.image_tag}".blue
-    sh cmd.join(' '), verbose: debug?
+    sh cmd.join(' '), verbose: debug
   end
 
   def container_exec!(exec_cmd, extra_args = [])
@@ -293,33 +261,29 @@ class OodPackaging::Package
     cmd.concat [container_name]
     cmd.concat exec_cmd
     puts "Build STARTED: package=#{package} dist=#{build_box.dist} exec=#{exec_cmd[-1]}".blue
-    sh cmd.join(' '), verbose: debug?
-    true
-  rescue RuntimeError
-    container_kill! if container_running? && !attach?
-    raise
+    sh cmd.join(' '), verbose: debug
   end
 
   def container_kill!
     puts "Killing container #{container_name}".blue
     cmd = [container_runtime, 'kill', container_name]
-    cmd.concat [cmd_suffix] unless debug?
-    sh cmd.join(' '), verbose: debug?
+    cmd.concat ['1>/dev/null', '2>/dev/null'] unless debug
+    sh cmd.join(' '), verbose: debug
   end
 
   def container_env
     env = {
       'DIST'          => build_box.dist,
       'PACKAGE'       => package_name,
-      'VERSION'       => version,
-      'TAR_NAME'      => "#{tar_name}.tar.gz",
       'GPG_SIGN'      => gpg_sign,
       'GPG_NAME'      => gpg_name,
       'SKIP_DOWNLOAD' => @config[:skip_download],
       'OOD_UID'       => Process.uid,
       'OOD_GID'       => Process.gid,
-      'DEBUG'         => debug?
+      'DEBUG'         => debug
     }
+    env['VERSION'] = rpm_version if build_box.rpm?
+    env['VERSION'] = deb_version if build_box.deb?
     env['GPG_PUBKEY'] = '/gpg.pub' if @config[:gpg_pubkey]
     env
   end

data/lib/ood_packaging/rake_task.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
-require 'ood_packaging'
+require 'ood_packaging/options'
+require 'ood_packaging/package'
+require 'ood_packaging/utils'
 require 'rake'
 require 'rake/tasklib'
 

data/lib/ood_packaging/tasks.rb

@@ -7,14 +7,6 @@ require 'ood_packaging/utils'
 namespace :ood_packaging do
   include OodPackaging::Utils
 
-  desc 'Set version'
-  task :version, [:version] do |_task, args|
-    version_file = File.join(proj_root, 'lib/ood_packaging/version.rb')
-    version = args[:version].gsub(/^v/, '')
-    sh "#{sed} -i -r \"s|  VERSION =.*|  VERSION = '#{version}'|g\" #{version_file}"
-    sh 'bundle install'
-  end
-
   namespace :buildbox do
     desc 'Build buildbox image'
     task :build, [:dist] do |_task, args|
@@ -28,12 +20,6 @@ namespace :ood_packaging do
       @build_box.push!
     end
 
-    desc 'Pull buildbox image'
-    task :pull, [:dist] do |_task, args|
-      @build_box = OodPackaging::BuildBox.new(args)
-      @build_box.pull!
-    end
-
     desc 'Save buildbox image'
     task :save, [:dist, :path] do |_task, args|
       @build_box = OodPackaging::BuildBox.new(args)
@@ -50,9 +36,8 @@ namespace :ood_packaging do
     OodPackaging::RakeTask.new(:internal, [:package, :dist]) do |t, args|
       name = args[:package].split(':').last
       t.package = File.join(proj_root, 'packages', name)
-      dist = args[:dist] || ENV['OOD_PACKAGING_DIST']
-      t.dist = dist
-      t.version = OodPackaging.package_version(name, dist)
+      t.dist = args[:dist]
+      t.version = OodPackaging.package_version(name, args[:dist])
       t.work_dir = File.join(proj_root, 'tmp/work')
       t.output_dir = File.join(proj_root, 'tmp/output')
     end

data/lib/ood_packaging/utils.rb

@@ -15,13 +15,6 @@ module OodPackaging::Utils
     end
   end
 
-  def sed
-    @sed ||= begin
-      `which gsed 1>/dev/null 2>&1`
-      $CHILD_STATUS.success? ? 'gsed' : 'sed'
-    end
-  end
-
   def podman_runtime?
     @podman_runtime ||= ENV['CONTAINER_RT'] == 'podman' || ENV['container'] == 'podman'
   end
@@ -55,7 +48,7 @@ module OodPackaging::Utils
   end
 
   def ondemand_repo_version
-    '2.0'
+    '2.1'
   end
 
   def ruby_version
@@ -67,17 +60,13 @@ module OodPackaging::Utils
   end
 
   def nodejs_version
-    '12'
+    '14'
   end
 
   def ctr_scripts_dir
     '/ondemand-packaging'
   end
 
-  def ctr_gems_dir
-    File.join(ctr_scripts_dir, 'gems')
-  end
-
   def gpg_private_key
     File.join(ctr_scripts_dir, 'ondemand.sec')
   end

data/lib/ood_packaging/version.rb

@@ -2,25 +2,25 @@
 
 # Version code for OodPackaging
 module OodPackaging
-  VERSION = '0.0.1.r2.0'
+  VERSION = '0.0.1.rc.3'
   PACKAGE_VERSION = {
     'ondemand-release'        => {
-      '(ubuntu|debian)' => '2.0.0',
-      'default'         => '2.0'
+      '(ubuntu|debian)' => '2.1.0',
+      'default'         => '2.1'
     },
     'ondemand-release-latest' => {
       '(ubuntu|debian)' => '1',
-      'default'         => '1-7'
+      'default'         => '1-6'
     },
-    'ondemand-runtime'        => '2.0-2',
-    'passenger'               => '6.0.14',
+    'ondemand-runtime'        => '2.1',
+    'passenger'               => '6.0.11',
     'cjose'                   => '0.6.1',
     'mod_auth_openidc'        => '2.4.5',
     'sqlite'                  => '3.26.0-4',
     'ondemand_exporter'       => '0.9.0',
     'ondemand-compute'        => {
-      '(ubuntu|debian)' => '2.0',
-      'default'         => '2.0'
+      '(ubuntu|debian)' => '2.1.0',
+      'default'         => '2.1'
     },
     'python-websockify'       => '0.8.0',
     'turbovnc'                => '2.2.5'

data/lib/tasks/package_utils.rb

@@ -0,0 +1,197 @@
+# frozen_string_literal: true
+
+require 'English'
+require 'erb'
+require 'tempfile'
+
+# Package utilities
+module PackageUtils
+  def version
+    @version ||= if ENV['VERSION']
+                   ENV['VERSION'].to_s
+                 else
+                   tag? ? git_tag : "#{git_tag}-#{git_hash}"
+                 end
+  end
+
+  def build_timestamp
+    @build_timestamp ||= Time.now.strftime('%s')
+  end
+
+  def git_hash
+    @git_hash ||= `git rev-parse HEAD`.strip[0..6]
+  end
+
+  def git_tag
+    @git_tag ||= `git describe --tags --abbrev=0`.chomp
+  end
+
+  def numeric_tag
+    @numeric_tag ||= git_tag.delete_prefix('v')
+  end
+
+  def tag?
+    @tag ||= `git describe --exact-match --tags HEAD 2>/dev/null`.to_s != ''
+  end
+
+  def podman_runtime?
+    @podman_runtime ||= ENV['CONTAINER_RT'] == 'podman'
+  end
+
+  def docker_runtime?
+    !podman_runtime?
+  end
+
+  def container_runtime
+    podman_runtime? ? 'podman' : 'docker'
+  end
+
+  def tar
+    @tar ||= begin
+      `which gtar 1>/dev/null 2>&1`
+      $CHILD_STATUS.success? ? 'gtar' : 'tar'
+    end
+  end
+
+  def src_dir
+    ENV['OOD_SRC_DIR'] || '.'
+  end
+
+  def user
+    @user ||= Etc.getpwnam(Etc.getlogin)
+  end
+
+  def build_dir(args)
+    @build_dir ||= "#{src_dir}/build/#{build_box_image(args).gsub(':', '-')}".tap { |d| sh "mkdir -p #{d}" }
+  end
+
+  # TODO: continue vendor/ convention? Seems as good as any other name.
+  def vendor_src_dir
+    'vendor/ood/src'.tap { |p| sh "mkdir -p #{p}" }
+  end
+
+  def vendor_build_dir
+    'vendor/ood/build'.tap { |p| sh "mkdir -p #{p}" }
+  end
+
+  def dist_dir(args)
+    dist = args[:dist].to_s
+    version = args[:version].to_s
+    "dist/#{dist}#{version}"
+  end
+
+  def known_images
+    {
+      'ubuntu-20.04': '1'
+    }.freeze
+  end
+
+  def build_box_image(args)
+    base_name = "#{args[:dist]}-#{args[:version]}"
+    @version_lookup ||= Hash.new('1').merge(known_images)
+
+    "#{build_box_name}:#{base_name}-#{@version_lookup[base_name.to_sym]}"
+  end
+
+  def build_box_name
+    ENV['OOD_BUILD_BOX'] || 'ood-buildbox'
+  end
+
+  def image_exists?(image_name)
+    `#{container_runtime} inspect --type image --format exists #{image_name} || true`.chomp.eql?('exists')
+  end
+
+  def build_cmd(file, image)
+    args = [container_runtime, 'build', '-t', image, '-f', file]
+    args.concat '.' if docker_runtime?
+    args.join(' ')
+  end
+
+  def template_file(filename)
+    cwd = File.expand_path(__dir__).to_s
+    content = File.read("#{cwd}/templates/#{filename}")
+    content = ERB.new(content, trim_mode: '-').result(binding)
+
+    begin
+      t = Tempfile.new('ood-docker')
+      t.write(content)
+      t.path
+    ensure
+      t.close
+    end
+  end
+
+  def ctr_home
+    "/home/#{ctr_user}"
+  end
+
+  def ctr_user
+    'ood'
+  end
+
+  def ctr_run_args
+    [
+      '--rm', '--user', "#{ctr_user}:#{ctr_user}",
+      '-e', 'LC_CTYPE=en_US.UTF-8'
+    ].concat(rt_specific_flags)
+  end
+
+  def rt_specific_flags
+    if podman_runtime?
+      # SELinux doesn't like it if you're mounting from $HOME
+      ['--security-opt', 'label=disable', '--userns=keep-id']
+    else
+      []
+    end
+  end
+
+  def arch
+    'x86_64'
+  end
+
+  def spec_location
+    sf = Dir.glob('packaging/rpm/*.spec').first
+    raise StandardError, 'Cannot find spec file in packaging/rpm' if sf.nil?
+
+    sf
+  end
+
+  def spec_file
+    File.basename(spec_location)
+  end
+
+  def rpm_build_args
+    [git_tag_define, version_define, '-ba', '--nodeps', '-vv', spec_file]
+
+    # if git_prerelease_tag.size >= 2
+    #   git_prerelease_verison = git_prerelease_tag[0]
+    #   git_prerelease_verison = git_prerelease_verison[1..-1] if git_prerelease_verison.start_with?('v')
+    #   version_define = "--define 'package_version #{git_prerelease_verison}'"
+    #   if git_tag.size >= 2
+    #     prerelease = git_prerelease_tag[1].gsub('-', '.')
+    #     release_define = "--define 'package_release 0.#{prerelease}'"
+    #   else
+    #     release_define = "--define 'package_release 0.#{git_prerelease_tag[1]}.1'"
+    #   end
+    # else
+    #   version_define = "--define 'package_version #{git_tag_version}'"
+    #   release_define = if git_tag.size >= 2
+    #                      "--define 'package_release #{git_tag[1]}'"
+    #                    else
+    #                      ''
+    #                    end
+    # end
+  end
+
+  def version_define
+    git_tag = version.split('-')
+    git_tag_version = git_tag[0]
+    git_tag_version = git_tag_version[1..] if git_tag_version.start_with?('v')
+
+    "--define 'package_version #{git_tag_version}'"
+  end
+
+  def git_tag_define
+    "--define 'git_tag #{version}'"
+  end
+end

data/lib/tasks/packaging.rb

@@ -0,0 +1,111 @@
+# frozen_string_literal: true
+
+desc 'Package OnDemand'
+namespace :package do
+  require_relative 'package_utils'
+  include PackageUtils
+
+  desc 'Tar and zip OnDemand into packaging dir with version name v#<version>'
+  task :tar, [:output_dir] do |_task, args|
+    version = ENV['VERSION'] || ENV['CI_COMMIT_TAG']
+    version = version.gsub(/^v/, '') unless version.nil?
+
+    chdir src_dir do
+      unless version
+        latest_commit = `git rev-list --tags --max-count=1`.strip[0..6]
+        latest_tag = `git describe --tags #{latest_commit}`.strip[1..]
+        datetime = Time.now.strftime('%Y%m%d-%H%M')
+        version = "#{latest_tag}-#{datetime}-#{latest_commit}"
+      end
+
+      dir = (args[:output_dir] || 'packaging/rpm').to_s.tap { |p| sh "mkdir -p #{p}" }
+      sh "git ls-files | #{tar} -c --transform 's,^,ondemand-#{version}/,' -T - | gzip > #{dir}/v#{version}.tar.gz"
+    end
+  end
+
+  # TODO: refactor these 2 tar tasks. Debian and RHEL expect slightly different names and
+  # what's worse is the whole v prefixing mess
+  task :debian_tar, [:output_dir] do |_task, args|
+    dir = (args[:output_dir] || 'packaging').to_s.tap { |p| sh "mkdir -p #{p}" }
+    tar_file = "#{dir}/#{ood_package_tar}"
+
+    sh "rm #{tar_file}" if File.exist?(tar_file)
+    sh "git ls-files | #{tar} -c --transform 's,^,#{versioned_ood_package}/,' -T - | gzip > #{tar_file}"
+  end
+
+  task :version do
+    puts package_version
+  end
+
+  task :deb, [:dist, :version] => [:build_box] do |_task, args|
+    dir = build_dir(args)
+    Rake::Task['package:debian_tar'].invoke(dir)
+    sh "#{tar} -xzf #{dir}/#{ood_package_tar} -C #{dir}"
+
+    work_dir = "/build/#{versioned_ood_package}"
+
+    base_args = ctr_run_args
+    base_args.concat ['-v', "#{dir}:/build", '-w', work_dir.to_s]
+    base_args.concat ['-e', "DEBUILD_DPKG_BUILDPACKAGE_OPTS='-us -uc -I -i'"]
+    base_args.concat ['-e', 'HOME=/home/ood', '-e', 'USER=ood']
+    base_args.concat ['-e', "VERSION=#{ENV['VERSION']}"] unless ENV['VERSION'].nil?
+    base_args.concat [build_box_image(args)]
+    sh "#{container_runtime} run #{base_args.join(' ')} debmake -b':ruby'"
+
+    debuild_args = ['debuild', '--no-lintian']
+    sh "#{container_runtime} run #{base_args.join(' ')} #{debuild_args.join(' ')}"
+  end
+
+  task :bootstrap_rpm, [:dist, :version] => [:verify_args] do |_task, args|
+    chdir src_dir do
+      build_dir(args).tap do |d|
+        src_dir = "#{d}/rpmbuild/SOURCES".tap { |s| sh "mkdir -p #{s}" }
+        dist_dir(args).tap { |dd| sh "mkdir -p #{dd}" }
+        Rake::Task['package:tar'].invoke(src_dir)
+
+        FileUtils.cp Dir.glob('packaging/rpm/*.{fc,te,ico,png,tar.gz}'), src_dir
+        FileUtils.cp spec_location, d
+      end
+    end
+  end
+
+  desc 'Build an RPM'
+  task :rpm, [:dist, :version] => [:build_box, :bootstrap_rpm] do |_task, args|
+    dir = build_dir(args)
+    image = build_box_image(args)
+
+    base_args = ctr_run_args
+    base_args.concat ['-v', "#{dir}:#{ctr_home}", '-w', "'#{ctr_home}'"]
+    base_args.concat ['-e', "HOME=#{ctr_home}"]
+
+    chdir src_dir do
+      sh "#{container_runtime} run #{base_args.join(' ')} #{image} rpmbuild #{rpm_build_args.join(' ')}"
+      FileUtils.cp Dir.glob("#{dir}/rpmbuild/RPMS/#{arch}/*.rpm"), dist_dir(args)
+    end
+  end
+
+  namespace :rpm do
+    desc 'Build nightly RPM'
+    task :nightly, [:dist, :extra_args] do |_task, args|
+      version_major, version_minor = git_tag.gsub(/^v/, '').split('.', 3)
+      date = Time.now.strftime('%Y%m%d')
+      id = ENV['CI_PIPELINE_ID'] || Time.now.strftime('%H%M%S')
+      ENV['VERSION'] = "#{version_major}.#{version_minor}.#{date}-#{id}.#{git_hash}.nightly"
+      Rake::Task['package:rpm'].invoke(args[:dist], args[:extra_args])
+    end
+  end
+
+  task :verify_args, [:dist, :version] do |_task, args|
+    raise 'Need to specify :dist and :version' if args[:dist].nil? || args[:version].nil?
+  end
+
+  desc 'Create buildbox for Open OnDemand'
+  task :build_box, [:dist, :version] => [:verify_args] do |_task, args|
+    cmd = build_cmd(
+      template_file("Dockerfile.#{args[:dist]}.erb"),
+      build_box_image(args)
+    )
+
+    sh cmd unless image_exists?(build_box_image(args))
+  end
+end

data/lib/tasks/templates/Dockerfile.el.erb

@@ -0,0 +1,21 @@
+FROM centos:8
+
+# install all the dependencies
+RUN dnf -y update 
+RUN dnf install -y dnf-utils 
+RUN dnf config-manager --set-enabled powertools
+RUN dnf -y module enable nodejs:12 ruby:2.7
+RUN dnf install -y \
+        make gcc gcc-c++ git rsync rpm-build redhat-rpm-config
+RUN dnf install -y libselinux libselinux-devel
+RUN dnf install -y selinux-policy selinux-policy-devel
+RUN dnf install -y scl-utils
+
+RUN dnf install -y https://yum.osc.edu/ondemand/latest/ondemand-release-web-latest-1-6.noarch.rpm
+RUN dnf install -y \
+        ondemand-runtime ondemand-scldevel ondemand-build ondemand-ruby ondemand-python ondemand-nodejs 
+
+RUN dnf clean all && rm -rf /var/cache/dnf/*
+
+RUN groupadd <%= ctr_user %> && \
+    useradd --create-home --gid <%= ctr_user %> <%= ctr_user %>

data/lib/tasks/templates/Dockerfile.ubuntu.erb

@@ -0,0 +1,15 @@
+from ubuntu:20.04
+
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN apt update && \
+  apt install -y \
+    ruby=1:2.7+1 ruby-dev=1:2.7+1 \
+    nodejs npm \
+    make g++ gcc sqlite3 libsqlite3-dev \
+    debmake debhelper
+
+RUN groupadd <%= ctr_user %> && \
+    useradd --create-home --gid <%= ctr_user %> <%= ctr_user %>
+
+RUN ln -s /bin/bundle2.7 /bin/bundle

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ood_packaging
 version: !ruby/object:Gem::Version
-  version: 0.0.1.r2.0
+  version: 0.0.1.rc.3
 platform: ruby
 authors:
 - Trey Dockendorf
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-07-19 00:00:00.000000000 Z
+date: 2021-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -94,6 +94,10 @@ files:
 - lib/ood_packaging/tasks.rb
 - lib/ood_packaging/utils.rb
 - lib/ood_packaging/version.rb
+- lib/tasks/package_utils.rb
+- lib/tasks/packaging.rb
+- lib/tasks/templates/Dockerfile.el.erb
+- lib/tasks/templates/Dockerfile.ubuntu.erb
 homepage: https://github.com/OSC/ondemand-packaging
 licenses:
 - MIT
@@ -113,7 +117,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.2.33
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Open OnDemand packaging library