ood_packaging 0.1.0 → 0.1.3

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 80fe80e20ad800efba449504ba04074ede51db0f0bb8c22b77995e28ecc9c350
4
- data.tar.gz: f5199c57d54acd2c01ad3d50f28315141bbcb199271deec5af9049d790f362a9
3
+ metadata.gz: 3cde2530b3969ac7730bc4b756cf77b3c83e01232f81c0f6bb3a3776c84ce68b
4
+ data.tar.gz: bd4ab8c4978ab78d4c5d6ca18b0bf871341425eca3b7e717941cc5b7cb3c34b2
5
5
  SHA512:
6
- metadata.gz: b9d32724c91dbe5d77b886eaaf318b109df6c38bdbb450da79de53fcfc80eb7cccefa7e9ef780b52d0369caa151014a2e21bd694f60345f9d27d24a0d4057cb2
7
- data.tar.gz: 4a1e28f5c482a9714d4c9dfa272089833b67c87132fc3edd9786cd0494617221704553823f72e89e5d229bda6b483115a0f776c481a602442a2e1b9e3c045fe9
6
+ metadata.gz: 4a279084d8b5a30e1e9daaa07fe429eaf2278ce23ba1504f245b023a4b134b43467e15ca99dd50a2ab927c4c266111f0cb7943faa34c8520e3a99d62534c9c62
7
+ data.tar.gz: 91d11c7f53b67b5e6f277d416c1e5ba6458fba3fe8004caaba073b214c162fb74d045d318f42e087f02b4d4b96f9e67907eacece38731b7f2ae66a5e00cbd7e9
@@ -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
@@ -2,6 +2,7 @@ FROM <%= base_image %>
2
2
  MAINTAINER Trey Dockendorf <tdockendorf@osc.edu>
3
3
  ENV LANG=en_US.UTF-8
4
4
  ENV LC_CTYPE=en_US.UTF-8
5
+ ENV USER=<%= ctr_user %>
5
6
  ENV GEM_PATH=<%= ctr_gems_dir %>:
6
7
  <% if dist == 'el7' -%>
7
8
  RUN yum update -y && yum clean all && rm -rf /var/cache/yum/*
@@ -9,13 +10,16 @@ RUN yum install -y yum-utils epel-release centos-release-scl && yum clean all &&
9
10
  RUN yum install -y <%= scl_ruby %>-ruby sudo which wget @buildsys-build \
10
11
  rpm-build rpmdevtools rpm-sign scl-utils-build && \
11
12
  yum clean all && rm -rf /var/cache/yum/*
13
+ RUN rm -f /etc/yum.repos.d/CentOS-Vault.repo /etc/yum.repos.d/CentOS-Sources.repo
14
+ RUN head -n 13 /etc/yum.repos.d/CentOS-SCLo-scl.repo > /etc/yum.repos.d/CentOS-SCLo.repo
15
+ RUN head -n 13 /etc/yum.repos.d/CentOS-SCLo-scl-rh.repo >> /etc/yum.repos.d/CentOS-SCLo.repo
16
+ RUN rm -f /etc/yum.repos.d/CentOS-SCLo-scl-rh.repo /etc/yum.repos.d/CentOS-SCLo-scl.repo
12
17
  <% elsif dist =~ /^el/ -%>
13
18
  RUN dnf update -y && dnf clean all && rm -rf /var/cache/dnf/*
14
19
  RUN dnf install -y dnf-utils epel-release langpacks-en glibc-all-langpacks && dnf clean all && rm -rf /var/cache/dnf/*
15
20
  RUN dnf config-manager --set-enabled powertools && dnf clean all && rm -rf /var/cache/dnf/*
16
- RUN dnf module enable -y ruby:<%= ruby_version %> && dnf clean all && rm -rf /var/cache/dnf/*
17
- RUN dnf module enable -y nodejs:<%= nodejs_version %> && dnf clean all && rm -rf /var/cache/dnf/*
18
- 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 \
19
23
  gcc-c++ gcc make patch \
20
24
  rpm-build rpmdevtools rpm-sign scl-utils-build && \
21
25
  dnf clean all && rm -rf /var/cache/dnf/*
@@ -2,7 +2,7 @@
2
2
 
3
3
  # Version code for OodPackaging
4
4
  module OodPackaging
5
- VERSION = '0.1.0'
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.0
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: 2021-12-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