ood_packaging 0.1.2 → 0.1.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. checksums.yaml +4 -4
  2. data/lib/ood_packaging/build.rb +2 -0
  3. data/lib/ood_packaging/build_box/docker-image/Dockerfile.erb +2 -3
  4. data/lib/ood_packaging/version.rb +2 -2
  5. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 2857f47b97ce6a278c7b0cd73b9a8c2f182143dd11f03410b796a6c9182c1644
4
- data.tar.gz: 1f6cf54832aff67ee8f216f11515677a558339dc5c3eb814ed3edc9d6b0d593a
3
+ metadata.gz: 3cde2530b3969ac7730bc4b756cf77b3c83e01232f81c0f6bb3a3776c84ce68b
4
+ data.tar.gz: bd4ab8c4978ab78d4c5d6ca18b0bf871341425eca3b7e717941cc5b7cb3c34b2
5
5
  SHA512:
6
- metadata.gz: 445e8e7f68c11d1b22844d40017d8ec63c0614b06cf4b500a595fe983f323471572e3c370dbc57d7512242e4cf5fbf32892a7359c5a80bbd7f39e22a62aafe36
7
- data.tar.gz: 5fa5a994c351f9cc09b8ba4f0812af4de2933d685e1204c61e033c0b479d6459fa8a7f13a068f8d8314b19ad71943f5d8b3c1deab3aee29859094fbc11caf511
6
+ metadata.gz: 4a279084d8b5a30e1e9daaa07fe429eaf2278ce23ba1504f245b023a4b134b43467e15ca99dd50a2ab927c4c266111f0cb7943faa34c8520e3a99d62534c9c62
7
+ data.tar.gz: 91d11c7f53b67b5e6f277d416c1e5ba6458fba3fe8004caaba073b214c162fb74d045d318f42e087f02b4d4b96f9e67907eacece38731b7f2ae66a5e00cbd7e9
data/lib/ood_packaging/build.rb CHANGED
@@ -94,6 +94,8 @@ class OodPackaging::Build
94
94
  def debian_dir
95
95
  @debian_dir ||= if Dir.exist?('/package/deb/debian')
96
96
  '/package/deb/debian'
97
+ elsif Dir.exist?('/package/packaging/deb')
98
+ '/package/packaging/deb'
97
99
  else
98
100
  '/package/debian'
99
101
  end
data/lib/ood_packaging/build_box/docker-image/Dockerfile.erb CHANGED
@@ -18,9 +18,8 @@ RUN rm -f /etc/yum.repos.d/CentOS-SCLo-scl-rh.repo /etc/yum.repos.d/CentOS-SCLo-
18
18
  RUN dnf update -y && dnf clean all && rm -rf /var/cache/dnf/*
19
19
  RUN dnf install -y dnf-utils epel-release langpacks-en glibc-all-langpacks && dnf clean all && rm -rf /var/cache/dnf/*
20
20
  RUN dnf config-manager --set-enabled powertools && dnf clean all && rm -rf /var/cache/dnf/*
21
- RUN dnf module enable -y ruby:<%= ruby_version %> && dnf clean all && rm -rf /var/cache/dnf/*
22
- RUN dnf module enable -y nodejs:<%= nodejs_version %> && dnf clean all && rm -rf /var/cache/dnf/*
23
- RUN dnf install -y ruby sudo which wget \
21
+ RUN dnf module enable -y ruby:<%= ruby_version %> nodejs:<%= nodejs_version %> && dnf clean all && rm -rf /var/cache/dnf/*
22
+ RUN dnf install -y systemd ruby sudo which wget \
24
23
  gcc-c++ gcc make patch \
25
24
  rpm-build rpmdevtools rpm-sign scl-utils-build && \
26
25
  dnf clean all && rm -rf /var/cache/dnf/*
data/lib/ood_packaging/version.rb CHANGED
@@ -2,7 +2,7 @@
2
2
 
3
3
  # Version code for OodPackaging
4
4
  module OodPackaging
5
- VERSION = '0.1.2'
5
+ VERSION = '0.1.3'
6
6
  PACKAGE_VERSION = {
7
7
  'ondemand-release' => {
8
8
  '(ubuntu|debian)' => '2.1.0',
@@ -13,7 +13,7 @@ module OodPackaging
13
13
  'default' => '1-6'
14
14
  },
15
15
  'ondemand-runtime' => '2.1',
16
- 'passenger' => '6.0.11',
16
+ 'passenger' => '6.0.14',
17
17
  'cjose' => '0.6.1',
18
18
  'mod_auth_openidc' => '2.4.5',
19
19
  'sqlite' => '3.26.0-4',
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: ood_packaging
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.2
4
+ version: 0.1.3
5
5
  platform: ruby
6
6
  authors:
7
7
  - Trey Dockendorf
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2022-03-29 00:00:00.000000000 Z
12
+ date: 2022-05-23 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: rake