ood_packaging 0.1.1 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aa2b7436d1b6f72707cc1a9aa456bcb9a7c028ab37fb1b9b052cc6d5c23c58ce
-  data.tar.gz: 9f026d1fa74b3718018be2079f92510ca324639f0218776977741e250c184e2d
+  metadata.gz: 7c70a0f572ecbb2e7e338c08dd43009335d7552750fd5f7717f154bc637d1c1a
+  data.tar.gz: 7f3e84f57c4f1c245f6d5daec190da5690a310c136efaf8a3732ba89ad2fed59
 SHA512:
-  metadata.gz: a443b1559a488884dfbf40932f3acf5a3ccc127dc733b8cdf442f29d21aeef2ba762dbf6a4b121b072945751d98116627bb0a0e7053922f41801135bb043b3fe
-  data.tar.gz: 4b5bbb85bf7d3981179812e048d859dc132d6650f7f936e29b20fdd8615e2b56dd2dcce3fad4a817743c7baa7735dcbf62cc7e8d43e93381fc81e8ee8abb973a
+  metadata.gz: 9c458f0bd60de9599fed549de0602785a9a3611fda8ea61f5547aa6201bb260fc935d9ad8adb8d68a50abe7b4a6ae1b8b029b9b711ed7bec4b3ae1309103206e
+  data.tar.gz: e0af0043f8ee483a2eea671c8849a01c941bdd71eb5ecf296c1079528a847bdf96d441ddbcb7340050303dcaaae6f571d9f96df3d2d60a9366802007f6017df9

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

@@ -2,6 +2,7 @@ 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 dist == 'el7' -%>
 RUN yum update -y && yum clean all && rm -rf /var/cache/yum/*
@@ -17,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/*
@@ -30,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/version.rb

@@ -2,7 +2,7 @@
 
 # Version code for OodPackaging
 module OodPackaging
-  VERSION = '0.1.1'
+  VERSION = '0.1.4'
   PACKAGE_VERSION = {
     'ondemand-release'        => {
       '(ubuntu|debian)' => '2.1.0',
@@ -13,7 +13,7 @@ module OodPackaging
       'default'         => '1-6'
     },
     'ondemand-runtime'        => '2.1',
-    'passenger'               => '6.0.11',
+    '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.1
+  version: 0.1.4
 platform: ruby
 authors:
 - Trey Dockendorf
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-28 00:00:00.000000000 Z
+date: 2022-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake