conjur-debify 1.11.1 → 1.11.2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +15 -1
- data/Dockerfile +1 -1
- data/Jenkinsfile +6 -2
- data/VERSION +1 -1
- data/lib/conjur/fpm/Dockerfile +3 -9
- metadata +3 -4
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: aa6af330a692efe6fc340c88506e232d9118e2b3b90303d025a851b103ef58f9
|
|
4
|
+
data.tar.gz: c160e06f5a00c751c1a50f281b44f38925b9c4f03620e8f0c5203105c55af527
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: a0672e9057d8ac3acbce9387dccd3523c3ce3db9446a7c88fa61518d667e8cead9acf4c9af74bfb81ff89a4799d52545a7c318a30b5186e626111d9e07105076
|
|
7
|
+
data.tar.gz: 29df6653100104e47112ffdfa98b0d40133cbd8b34ab5b3cefcf7ff8aa014e4f302565c29f9793cd9add2d36e77fd95ad2ecb6925fe6ad0bcda3f52fc9f68c2e
|
data/CHANGELOG.md
CHANGED
|
@@ -1,8 +1,22 @@
|
|
|
1
|
+
# 1.11.2
|
|
2
|
+
|
|
3
|
+
* Upgraded to use Ruby 2.6 and latest version of FPM
|
|
4
|
+
* Update Conjur Dockerfile from Ubuntu 14.04 --> 18.04 as 14.04 repos
|
|
5
|
+
are now behind a [pay wall](https://ubuntu.com/blog/ubuntu-14-04-esm-support)
|
|
6
|
+
Ruby is installed from `ppa:brightbox/ruby-ng` however that PPA
|
|
7
|
+
[doesn't currently supply ruby2.2 for Ubuntu 18.04](https://launchpad.net/~brightbox/+archive/ubuntu/ruby-ng?field.series_filter=bionic). [The documentation](https://www.brightbox.com/docs/ruby/ubuntu/)
|
|
8
|
+
suggests this combination is available, so it may be a temporary problem.
|
|
9
|
+
To work around the problem, ruby is bumped from 2.2 to 2.3 as 2.3 is the oldest
|
|
10
|
+
version available for Ubuntu 18.04.
|
|
11
|
+
|
|
12
|
+
# 1.11.1
|
|
13
|
+
* Upgrade `docker-debify` to use Ruby 2.6.
|
|
14
|
+
|
|
1
15
|
# 1.11.0
|
|
2
16
|
|
|
3
17
|
* Use a Docker env-file (docker.env, by default) to pass environment
|
|
4
18
|
variables to the debify container.
|
|
5
|
-
|
|
19
|
+
|
|
6
20
|
* Make sure `--env` variables get passed along to the Conjur container when testing, too.
|
|
7
21
|
|
|
8
22
|
# 1.10.3
|
data/Dockerfile
CHANGED
data/Jenkinsfile
CHANGED
|
@@ -9,6 +9,10 @@ pipeline {
|
|
|
9
9
|
skipDefaultCheckout()
|
|
10
10
|
}
|
|
11
11
|
|
|
12
|
+
triggers {
|
|
13
|
+
cron(getDailyCronString())
|
|
14
|
+
}
|
|
15
|
+
|
|
12
16
|
stages {
|
|
13
17
|
stage('Checkout') {
|
|
14
18
|
steps {
|
|
@@ -49,7 +53,7 @@ pipeline {
|
|
|
49
53
|
when {
|
|
50
54
|
allOf {
|
|
51
55
|
branch 'master'
|
|
52
|
-
expression {
|
|
56
|
+
/* expression {
|
|
53
57
|
boolean publish = false
|
|
54
58
|
|
|
55
59
|
try {
|
|
@@ -62,7 +66,7 @@ pipeline {
|
|
|
62
66
|
}
|
|
63
67
|
|
|
64
68
|
return publish
|
|
65
|
-
}
|
|
69
|
+
}*/
|
|
66
70
|
}
|
|
67
71
|
}
|
|
68
72
|
|
data/VERSION
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
1.11.
|
|
1
|
+
1.11.2
|
data/lib/conjur/fpm/Dockerfile
CHANGED
|
@@ -1,18 +1,13 @@
|
|
|
1
1
|
# Build from the same version of ubuntu as phusion/baseimage
|
|
2
|
-
FROM ubuntu:
|
|
2
|
+
FROM ubuntu:18.04
|
|
3
3
|
|
|
4
4
|
RUN apt-get update -y && \
|
|
5
5
|
apt-get install -y software-properties-common && \
|
|
6
6
|
apt-add-repository -y ppa:brightbox/ruby-ng && \
|
|
7
7
|
apt-get update -y && \
|
|
8
|
-
apt-get install -y build-essential git libpq5 libpq-dev ruby2.
|
|
8
|
+
apt-get install -y build-essential git libpq5 libpq-dev ruby2.6 ruby2.6-dev libffi-dev
|
|
9
9
|
|
|
10
|
-
|
|
11
|
-
# Configure bundler and gem the way the ruby:2.2 Dockerfile does, as of
|
|
12
|
-
# https://github.com/docker-library/ruby/commit/c88f3a67da720bfa9fb1717960d90fd5db11c757
|
|
13
|
-
ENV BUNDLER_VERSION 1.11.2
|
|
14
|
-
|
|
15
|
-
RUN gem install --no-rdoc --no-ri bundler:$BUNDLER_VERSION ruby-xz:0.2.3 fpm
|
|
10
|
+
RUN gem install --no-document bundler:2.0.2 fpm
|
|
16
11
|
|
|
17
12
|
ENV GEM_HOME /usr/local/bundle
|
|
18
13
|
ENV BUNDLE_PATH="$GEM_HOME" \
|
|
@@ -29,4 +24,3 @@ ENTRYPOINT [ "/package.sh" ]
|
|
|
29
24
|
|
|
30
25
|
COPY debify_utils.sh /
|
|
31
26
|
COPY package.sh /
|
|
32
|
-
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: conjur-debify
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 1.11.
|
|
4
|
+
version: 1.11.2
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Kevin Gilpin
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2019-
|
|
11
|
+
date: 2019-12-03 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: gli
|
|
@@ -249,8 +249,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
249
249
|
- !ruby/object:Gem::Version
|
|
250
250
|
version: '0'
|
|
251
251
|
requirements: []
|
|
252
|
-
|
|
253
|
-
rubygems_version: 2.7.7
|
|
252
|
+
rubygems_version: 3.0.3
|
|
254
253
|
signing_key:
|
|
255
254
|
specification_version: 4
|
|
256
255
|
summary: Utility commands to build and package Conjur services as Debian packages
|