conjur-debify 1.10.3 → 1.11.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +7 -0
- data/Dockerfile +3 -1
- data/Jenkinsfile +0 -4
- data/VERSION +1 -1
- data/debify.gemspec +2 -2
- data/image-tags +23 -0
- data/lib/conjur/debify.rb +1 -1
- data/lib/conjur/debify/action/publish.rb +4 -4
- data/push-image.sh +1 -4
- data/tag-image.sh +2 -4
- metadata +8 -7
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 94607aa6690de603becb0143bf6f009089a4c8d43a8380334ba55bd01c97600b
|
4
|
+
data.tar.gz: 5ce55a291b26f7e0164697a9ee20453c194ff3d785e7cb1307cbf313473db46b
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 1368be6d677fb7ecf73f03f87ecd4b927fa16a561fe9e46a4b1d5c653042a3474697b3428550cb9aab03c3a9bd2baf3caba4929157068bbaaa8832a6f1290bcd
|
7
|
+
data.tar.gz: 248b20b238f67377d926faf920e48c3b676d7ee1389dd813d85a6668404c28daeb8a0d75a37b9d28215089fd70ead5dec7f69e92cded7a54a8cfbd42031010bc
|
data/CHANGELOG.md
CHANGED
@@ -1,3 +1,10 @@
|
|
1
|
+
# 1.11.0
|
2
|
+
|
3
|
+
* Use a Docker env-file (docker.env, by default) to pass environment
|
4
|
+
variables to the debify container.
|
5
|
+
|
6
|
+
* Make sure `--env` variables get passed along to the Conjur container when testing, too.
|
7
|
+
|
1
8
|
# 1.10.3
|
2
9
|
|
3
10
|
* Fix a bug causing duplicate files between normal and dev packages when a file name contained a space.
|
data/Dockerfile
CHANGED
@@ -1,4 +1,4 @@
|
|
1
|
-
FROM ruby:2.
|
1
|
+
FROM ruby:2.6
|
2
2
|
|
3
3
|
### DockerInDocker support is take from
|
4
4
|
### https://github.com/jpetazzo/dind/blob/master/Dockerfile . I
|
@@ -38,5 +38,7 @@ RUN gem install -N conjur-debify-${VERSION}.gem
|
|
38
38
|
|
39
39
|
ARG CONJUR_APPLIANCE_URL
|
40
40
|
ENV CONJUR_APPLIANCE_URL ${CONJUR_APPLIANCE_URL:-https://conjur-master-v2.itp.conjur.net/api}
|
41
|
+
ENV CONJUR_ACCOUNT ${CONJUR_ACCOUNT:-conjur}
|
42
|
+
ENV CONJUR_VERSION ${CONJUR_VERSION:-4}
|
41
43
|
|
42
44
|
ENTRYPOINT ["/debify/distrib/entrypoint.sh"]
|
data/Jenkinsfile
CHANGED
data/VERSION
CHANGED
@@ -1 +1 @@
|
|
1
|
-
1.
|
1
|
+
1.11.1
|
data/debify.gemspec
CHANGED
@@ -19,8 +19,8 @@ Gem::Specification.new do |spec|
|
|
19
19
|
|
20
20
|
spec.add_dependency "gli"
|
21
21
|
spec.add_dependency "docker-api", "~> 1.33"
|
22
|
-
spec.add_dependency "conjur-cli" , "~>
|
23
|
-
spec.add_dependency "conjur-api", "~>
|
22
|
+
spec.add_dependency "conjur-cli" , "~> 6"
|
23
|
+
spec.add_dependency "conjur-api", "~> 5"
|
24
24
|
|
25
25
|
spec.add_development_dependency "bundler", "~> 1.7"
|
26
26
|
spec.add_development_dependency "fakefs", "~> 0"
|
data/image-tags
ADDED
@@ -0,0 +1,23 @@
|
|
1
|
+
#!/bin/bash -e
|
2
|
+
|
3
|
+
: ${BRANCH_NAME:=$(git symbolic-ref --short HEAD)}
|
4
|
+
|
5
|
+
show_master_tags() {
|
6
|
+
IFS=. read MAJOR MINOR PATCH <VERSION
|
7
|
+
TAG="$MAJOR.$MINOR.$PATCH"
|
8
|
+
echo "latest $TAG $MAJOR.$MINOR"
|
9
|
+
}
|
10
|
+
|
11
|
+
show_branch_tags() {
|
12
|
+
# tail and tr, to remove the grottiness from the detect-version
|
13
|
+
# output
|
14
|
+
local version="$(DEBIFY_IMAGE=debify:$(<VERSION) ./docker-debify detect-version | tail -1 | tr -d '\r')"
|
15
|
+
|
16
|
+
echo "$BRANCH_NAME $version"
|
17
|
+
}
|
18
|
+
|
19
|
+
if [[ "$BRANCH_NAME" == "master" ]]; then
|
20
|
+
show_master_tags
|
21
|
+
else
|
22
|
+
show_branch_tags
|
23
|
+
fi
|
data/lib/conjur/debify.rb
CHANGED
@@ -480,7 +480,7 @@ RUN touch /etc/service/conjur/down
|
|
480
480
|
"CONJUR_ENV=appliance",
|
481
481
|
"CONJUR_AUTHN_API_KEY=secret",
|
482
482
|
"CONJUR_ADMIN_PASSWORD=secret",
|
483
|
-
],
|
483
|
+
] + global_options[:env],
|
484
484
|
'HostConfig' => {
|
485
485
|
'Binds' => [
|
486
486
|
[ dir, "/src/#{project_name}" ].join(':')
|
@@ -71,10 +71,10 @@ module Conjur::Debify
|
|
71
71
|
Conjur::Config.apply
|
72
72
|
conjur = Conjur::Authn.connect nil, noask: true
|
73
73
|
|
74
|
-
|
75
|
-
|
76
|
-
|
77
|
-
[conjur.
|
74
|
+
account = Conjur.configuration.account
|
75
|
+
username_var = [account, "variable", "ci/artifactory/users/jenkins/username"].join(':')
|
76
|
+
password_var = [account, "variable", 'ci/artifactory/users/jenkins/password'].join(':')
|
77
|
+
[conjur.resource(username_var).value, conjur.resource(password_var).value]
|
78
78
|
end
|
79
79
|
|
80
80
|
def publish(options)
|
data/push-image.sh
CHANGED
@@ -1,9 +1,6 @@
|
|
1
1
|
#!/bin/bash -ex
|
2
2
|
|
3
|
-
|
4
|
-
|
5
|
-
TAGS="latest $(docker images --filter reference="registry.tld/conjurinc/debify:$MAJOR.$MINOR*" --format '{{.Tag}}')"
|
6
|
-
for t in $TAGS; do
|
3
|
+
for t in $(./image-tags); do
|
7
4
|
docker push registry.tld/conjurinc/debify:$t
|
8
5
|
done
|
9
6
|
|
data/tag-image.sh
CHANGED
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.
|
4
|
+
version: 1.11.1
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Kevin Gilpin
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date:
|
11
|
+
date: 2019-02-01 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: gli
|
@@ -44,28 +44,28 @@ dependencies:
|
|
44
44
|
requirements:
|
45
45
|
- - "~>"
|
46
46
|
- !ruby/object:Gem::Version
|
47
|
-
version: '
|
47
|
+
version: '6'
|
48
48
|
type: :runtime
|
49
49
|
prerelease: false
|
50
50
|
version_requirements: !ruby/object:Gem::Requirement
|
51
51
|
requirements:
|
52
52
|
- - "~>"
|
53
53
|
- !ruby/object:Gem::Version
|
54
|
-
version: '
|
54
|
+
version: '6'
|
55
55
|
- !ruby/object:Gem::Dependency
|
56
56
|
name: conjur-api
|
57
57
|
requirement: !ruby/object:Gem::Requirement
|
58
58
|
requirements:
|
59
59
|
- - "~>"
|
60
60
|
- !ruby/object:Gem::Version
|
61
|
-
version: '
|
61
|
+
version: '5'
|
62
62
|
type: :runtime
|
63
63
|
prerelease: false
|
64
64
|
version_requirements: !ruby/object:Gem::Requirement
|
65
65
|
requirements:
|
66
66
|
- - "~>"
|
67
67
|
- !ruby/object:Gem::Version
|
68
|
-
version: '
|
68
|
+
version: '5'
|
69
69
|
- !ruby/object:Gem::Dependency
|
70
70
|
name: bundler
|
71
71
|
requirement: !ruby/object:Gem::Requirement
|
@@ -209,6 +209,7 @@ files:
|
|
209
209
|
- features/support/hooks.rb
|
210
210
|
- features/support/world.rb
|
211
211
|
- features/test.feature
|
212
|
+
- image-tags
|
212
213
|
- lib/conjur/debify.rb
|
213
214
|
- lib/conjur/debify/Dockerfile.fpm
|
214
215
|
- lib/conjur/debify/action/publish.rb
|
@@ -249,7 +250,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
249
250
|
version: '0'
|
250
251
|
requirements: []
|
251
252
|
rubyforge_project:
|
252
|
-
rubygems_version: 2.7.
|
253
|
+
rubygems_version: 2.7.7
|
253
254
|
signing_key:
|
254
255
|
specification_version: 4
|
255
256
|
summary: Utility commands to build and package Conjur services as Debian packages
|