ood_packaging 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2857f47b97ce6a278c7b0cd73b9a8c2f182143dd11f03410b796a6c9182c1644
-  data.tar.gz: 1f6cf54832aff67ee8f216f11515677a558339dc5c3eb814ed3edc9d6b0d593a
+  metadata.gz: 3cde2530b3969ac7730bc4b756cf77b3c83e01232f81c0f6bb3a3776c84ce68b
+  data.tar.gz: bd4ab8c4978ab78d4c5d6ca18b0bf871341425eca3b7e717941cc5b7cb3c34b2
 SHA512:
-  metadata.gz: 445e8e7f68c11d1b22844d40017d8ec63c0614b06cf4b500a595fe983f323471572e3c370dbc57d7512242e4cf5fbf32892a7359c5a80bbd7f39e22a62aafe36
-  data.tar.gz: 5fa5a994c351f9cc09b8ba4f0812af4de2933d685e1204c61e033c0b479d6459fa8a7f13a068f8d8314b19ad71943f5d8b3c1deab3aee29859094fbc11caf511
+  metadata.gz: 4a279084d8b5a30e1e9daaa07fe429eaf2278ce23ba1504f245b023a4b134b43467e15ca99dd50a2ab927c4c266111f0cb7943faa34c8520e3a99d62534c9c62
+  data.tar.gz: 91d11c7f53b67b5e6f277d416c1e5ba6458fba3fe8004caaba073b214c162fb74d045d318f42e087f02b4d4b96f9e67907eacece38731b7f2ae66a5e00cbd7e9

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

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/*

data/lib/ood_packaging/version.rb

@@ -2,7 +2,7 @@
 
 # Version code for OodPackaging
 module OodPackaging
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
   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.2
+  version: 0.1.3
 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-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake