ood_packaging 0.1.3 → 0.1.4

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: 3cde2530b3969ac7730bc4b756cf77b3c83e01232f81c0f6bb3a3776c84ce68b
4
- data.tar.gz: bd4ab8c4978ab78d4c5d6ca18b0bf871341425eca3b7e717941cc5b7cb3c34b2
3
+ metadata.gz: 7c70a0f572ecbb2e7e338c08dd43009335d7552750fd5f7717f154bc637d1c1a
4
+ data.tar.gz: 7f3e84f57c4f1c245f6d5daec190da5690a310c136efaf8a3732ba89ad2fed59
5
5
  SHA512:
6
- metadata.gz: 4a279084d8b5a30e1e9daaa07fe429eaf2278ce23ba1504f245b023a4b134b43467e15ca99dd50a2ab927c4c266111f0cb7943faa34c8520e3a99d62534c9c62
7
- data.tar.gz: 91d11c7f53b67b5e6f277d416c1e5ba6458fba3fe8004caaba073b214c162fb74d045d318f42e087f02b4d4b96f9e67907eacece38731b7f2ae66a5e00cbd7e9
6
+ metadata.gz: 9c458f0bd60de9599fed549de0602785a9a3611fda8ea61f5547aa6201bb260fc935d9ad8adb8d68a50abe7b4a6ae1b8b029b9b711ed7bec4b3ae1309103206e
7
+ data.tar.gz: e0af0043f8ee483a2eea671c8849a01c941bdd71eb5ecf296c1079528a847bdf96d441ddbcb7340050303dcaaae6f571d9f96df3d2d60a9366802007f6017df9
@@ -221,7 +221,7 @@ class OodPackaging::Build
221
221
  puts "\tBootstrap debian build files".blue
222
222
  Dir.chdir(deb_work_dir) do
223
223
  sh "dh_make -s -y --createorig -f ../#{deb_name}.tar.gz#{cmd_suffix} || true"
224
- sh "dch -b -v #{deb_version} 'Release #{deb_version}'#{cmd_suffix}"
224
+ sh "dch -b -v #{deb_version} --controlmaint 'Release #{deb_version}'#{cmd_suffix}"
225
225
  end
226
226
  end
227
227
 
@@ -249,7 +249,7 @@ class OodPackaging::Build
249
249
  sh "sudo apt update -y#{cmd_suffix}"
250
250
  cmd = [
251
251
  'mk-build-deps --install --remove --root-cmd sudo',
252
- "--tool='apt-get -o Debug::pkgProblemResolver=yes --no-install-recommends --yes'"
252
+ "--tool='DEBIAN_FRONTEND=noninteractive apt-get -o Debug::pkgProblemResolver=yes --no-install-recommends --yes'"
253
253
  ]
254
254
  Dir.chdir(deb_work_dir) do
255
255
  sh "#{cmd.join(' ')}#{cmd_suffix}"
@@ -30,8 +30,7 @@ RUN apt update -y && apt install -y locales && locale-gen $LANG && \
30
30
  apt clean all -y
31
31
  RUN apt update -y && apt install -y apt-transport-https ca-certificates \
32
32
  init debhelper devscripts dh-make build-essential lintian equivs \
33
- sudo rake wget curl ruby && \
34
- ln -snf /bin/bundle2.7 /bin/bundle && \
33
+ sudo rake wget curl ruby bundler && \
35
34
  apt clean all -y
36
35
  RUN echo "deb https://deb.nodesource.com/node_<%= nodejs_version %>.x <%= codename %> main" > /etc/apt/sources.list.d/nodesource.list
37
36
  RUN curl -s https://deb.nodesource.com/gpgkey/nodesource.gpg.key | gpg --dearmor > /etc/apt/trusted.gpg.d/nodesource.gpg
@@ -12,11 +12,13 @@ class OodPackaging::BuildBox
12
12
  BASE_IMAGES = {
13
13
  'el7' => 'centos:7',
14
14
  'el8' => 'rockylinux/rockylinux:8',
15
- 'ubuntu-20.04' => 'ubuntu:20.04'
15
+ 'ubuntu-20.04' => 'ubuntu:20.04',
16
+ 'ubuntu-22.04' => 'ubuntu:22.04'
16
17
  }.freeze
17
18
 
18
19
  CODENAMES = {
19
- 'ubuntu-20.04' => 'focal'
20
+ 'ubuntu-20.04' => 'focal',
21
+ 'ubuntu-22.04' => 'jammy'
20
22
  }.freeze
21
23
 
22
24
  def initialize(config = {})
@@ -2,7 +2,7 @@
2
2
 
3
3
  # Version code for OodPackaging
4
4
  module OodPackaging
5
- VERSION = '0.1.3'
5
+ VERSION = '0.1.4'
6
6
  PACKAGE_VERSION = {
7
7
  'ondemand-release' => {
8
8
  '(ubuntu|debian)' => '2.1.0',
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.3
4
+ version: 0.1.4
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-05-23 00:00:00.000000000 Z
12
+ date: 2022-05-24 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: rake