ood_packaging 0.10.0 → 0.11.0
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.
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: f77bc1e85f9a6c049c43d9931ce9c8720c9bf8c0fac0b6232a24960e4bcbe388
|
|
4
|
+
data.tar.gz: 960644b6ecb3e8e73314602590e933bbcfc595ef3588e4be5fed7b486cf80152
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 72ace2609fdfda7a9e4b6191925543f293458895847118ce2848d8edf2509d0eec4547032def3d6cc252581e039fe785868e739908ac7280610016048b61a3e3
|
|
7
|
+
data.tar.gz: 7edac14c5ec2467d4307b0a733a0167b8469fc76688cbed308aec6a7cba07762e2d4eabb29d9ff0af2885aaa2209dad948a908814e0cad0f04436a2c67b1dc29
|
|
@@ -20,10 +20,12 @@ RUN dnf update -y && dnf clean all && rm -rf /var/cache/dnf/*
|
|
|
20
20
|
RUN dnf install -y dnf-utils <%= dist =~ /^el/ ? 'epel-release' : '' %> langpacks-en glibc-langpack-en && dnf clean all && rm -rf /var/cache/dnf/*
|
|
21
21
|
<% if dist == 'el8' -%>
|
|
22
22
|
RUN dnf config-manager --set-enabled powertools && dnf clean all && rm -rf /var/cache/dnf/*
|
|
23
|
-
RUN dnf module enable -y ruby:<%= ruby_version %> nodejs:<%= nodejs_version %> && dnf clean all && rm -rf /var/cache/dnf/*
|
|
24
23
|
<% elsif dist == 'el9' -%>
|
|
25
24
|
RUN dnf config-manager --set-enabled crb && dnf clean all && rm -rf /var/cache/dnf/*
|
|
26
25
|
<% end -%>
|
|
26
|
+
<% if dist =~ /^el/ -%>
|
|
27
|
+
RUN dnf module enable -y ruby:<%= ruby_version %> nodejs:<%= nodejs_version %> && dnf clean all && rm -rf /var/cache/dnf/*
|
|
28
|
+
<% end -%>
|
|
27
29
|
RUN dnf install -y --allowerasing systemd ruby nodejs sudo which wget \
|
|
28
30
|
gcc-c++ gcc make patch shadow-utils gnupg2 \
|
|
29
31
|
rpm-build rpmdevtools rpm-sign <%= dist =~ /^el/ ? 'scl-utils-build' : '' %> && \
|
data/lib/ood_packaging/utils.rb
CHANGED
|
@@ -63,7 +63,9 @@ module OodPackaging::Utils
|
|
|
63
63
|
end
|
|
64
64
|
|
|
65
65
|
def ruby_version
|
|
66
|
-
'3.0'
|
|
66
|
+
return '3.0' if dist == 'el7'
|
|
67
|
+
|
|
68
|
+
'3.1'
|
|
67
69
|
end
|
|
68
70
|
|
|
69
71
|
def scl_ruby
|
|
@@ -71,7 +73,7 @@ module OodPackaging::Utils
|
|
|
71
73
|
end
|
|
72
74
|
|
|
73
75
|
def nodejs_version
|
|
74
|
-
'
|
|
76
|
+
'18'
|
|
75
77
|
end
|
|
76
78
|
|
|
77
79
|
def ctr_scripts_dir
|
|
@@ -2,17 +2,17 @@
|
|
|
2
2
|
|
|
3
3
|
# Version code for OodPackaging
|
|
4
4
|
module OodPackaging
|
|
5
|
-
VERSION = '0.
|
|
5
|
+
VERSION = '0.11.0'
|
|
6
6
|
PACKAGE_VERSION = {
|
|
7
7
|
'ondemand-release' => {
|
|
8
8
|
'(ubuntu|debian)' => '3.1.0',
|
|
9
9
|
'default' => '3.1'
|
|
10
10
|
},
|
|
11
11
|
'ondemand-release-latest' => {
|
|
12
|
-
'(ubuntu|debian)' => '
|
|
12
|
+
'(ubuntu|debian)' => '2',
|
|
13
13
|
'default' => '1-8'
|
|
14
14
|
},
|
|
15
|
-
'ondemand-runtime' => '3.1.
|
|
15
|
+
'ondemand-runtime' => '3.1.3',
|
|
16
16
|
'scl-utils' => '2.0.3',
|
|
17
17
|
'passenger' => '6.0.17',
|
|
18
18
|
'cjose' => '0.6.1',
|
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.
|
|
4
|
+
version: 0.11.0
|
|
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: 2023-06-
|
|
12
|
+
date: 2023-06-21 00:00:00.000000000 Z
|
|
13
13
|
dependencies:
|
|
14
14
|
- !ruby/object:Gem::Dependency
|
|
15
15
|
name: rake
|