ood_packaging 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2857f47b97ce6a278c7b0cd73b9a8c2f182143dd11f03410b796a6c9182c1644
-  data.tar.gz: 1f6cf54832aff67ee8f216f11515677a558339dc5c3eb814ed3edc9d6b0d593a
+  metadata.gz: 700861e60a7c4cbfcf42804c78d23ba5e99fc4cf143cd0a2e424144ad224cb0b
+  data.tar.gz: 63e75fd5b747215c0bddb937f1680bd884b6c1592808612e67541fd23e4851d6
 SHA512:
-  metadata.gz: 445e8e7f68c11d1b22844d40017d8ec63c0614b06cf4b500a595fe983f323471572e3c370dbc57d7512242e4cf5fbf32892a7359c5a80bbd7f39e22a62aafe36
-  data.tar.gz: 5fa5a994c351f9cc09b8ba4f0812af4de2933d685e1204c61e033c0b479d6459fa8a7f13a068f8d8314b19ad71943f5d8b3c1deab3aee29859094fbc11caf511
+  metadata.gz: d9e1d7516304c4d40648e6ef6c9fafde08c16aa59d1614e6080282206e464fb29b65458becf79012a55e7f79ef664a309e8799cdb0dd4075819554a9fad6f10d
+  data.tar.gz: 806c2875b212f8186d4462422192b95ecca5bc0f9b96c722c8c4df46652186eedced6aeaf3dedce7fbb915614659a640bbe27d3bff8c5ef3d641443bffa5c65a

data/bin/ood_packaging

@@ -2,13 +2,9 @@
 # frozen_string_literal: true
 
 require 'optparse'
-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
+libdir = File.expand_path(File.join(__dir__, '../lib'))
+$LOAD_PATH.unshift(libdir) if Dir.exist?(libdir)
+require 'ood_packaging'
 
 options = {}
 OptionParser.new do |opts|

data/lib/ood_packaging/build.rb

@@ -94,6 +94,8 @@ 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
@@ -219,7 +221,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} 'Release #{deb_version}'#{cmd_suffix}"
+      sh "dch -b -v #{deb_version} --controlmaint 'Release #{deb_version}'#{cmd_suffix}"
     end
   end
 
@@ -247,7 +249,7 @@ class OodPackaging::Build
     sh "sudo apt update -y#{cmd_suffix}"
     cmd = [
       'mk-build-deps --install --remove --root-cmd sudo',
-      "--tool='apt-get -o Debug::pkgProblemResolver=yes --no-install-recommends --yes'"
+      "--tool='DEBIAN_FRONTEND=noninteractive 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

@@ -18,9 +18,8 @@ RUN rm -f /etc/yum.repos.d/CentOS-SCLo-scl-rh.repo /etc/yum.repos.d/CentOS-SCLo-
 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 %> && 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 \
+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 sudo which wget \
     gcc-c++ gcc make patch \
     rpm-build rpmdevtools rpm-sign scl-utils-build && \
     dnf clean all && rm -rf /var/cache/dnf/*
@@ -31,8 +30,7 @@ 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 lintian equivs \
-    sudo rake wget curl ruby && \
-    ln -snf /bin/bundle2.7 /bin/bundle && \
+    sudo rake wget curl ruby bundler && \
     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.rb

@@ -12,11 +12,13 @@ class OodPackaging::BuildBox
   BASE_IMAGES = {
     'el7'          => 'centos:7',
     'el8'          => 'rockylinux/rockylinux:8',
-    'ubuntu-20.04' => 'ubuntu:20.04'
+    'ubuntu-20.04' => 'ubuntu:20.04',
+    'ubuntu-22.04' => 'ubuntu:22.04'
   }.freeze
 
   CODENAMES = {
-    'ubuntu-20.04' => 'focal'
+    'ubuntu-20.04' => 'focal',
+    'ubuntu-22.04' => 'jammy'
   }.freeze
 
   def initialize(config = {})

data/lib/ood_packaging/package.rb

@@ -21,8 +21,6 @@ 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)
@@ -49,10 +47,22 @@ 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
@@ -200,8 +210,8 @@ 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!

data/lib/ood_packaging/utils.rb

@@ -59,7 +59,7 @@ module OodPackaging::Utils
   end
 
   def ruby_version
-    '2.7'
+    '3.0'
   end
 
   def scl_ruby

data/lib/ood_packaging/version.rb

@@ -2,7 +2,7 @@
 
 # Version code for OodPackaging
 module OodPackaging
-  VERSION = '0.1.2'
+  VERSION = '0.2.0'
   PACKAGE_VERSION = {
     'ondemand-release'        => {
       '(ubuntu|debian)' => '2.1.0',
@@ -12,8 +12,8 @@ module OodPackaging
       '(ubuntu|debian)' => '1',
       'default'         => '1-6'
     },
-    'ondemand-runtime'        => '2.1',
-    'passenger'               => '6.0.11',
+    'ondemand-runtime'        => '2.1.1',
+    'passenger'               => '6.0.14',
     'cjose'                   => '0.6.1',
     'mod_auth_openidc'        => '2.4.5',
     'sqlite'                  => '3.26.0-4',

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ood_packaging
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Trey Dockendorf
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-29 00:00:00.000000000 Z
+date: 2022-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -113,7 +113,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.2.33
 signing_key: 
 specification_version: 4
 summary: Open OnDemand packaging library