conjur-debify 1.11.5 → 2.1.1.pre.957
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.gitignore +1 -0
- data/CHANGELOG.md +32 -0
- data/Dockerfile +11 -24
- data/Jenkinsfile +47 -25
- data/README.md +6 -1
- data/Rakefile +2 -1
- data/VERSION +1 -1
- data/ci/test.sh +0 -5
- data/debify.gemspec +7 -7
- data/distrib/docker-debify +4 -2
- data/distrib/entrypoint.sh +4 -7
- data/example/Gemfile.lock +1 -1
- data/example/net-test.sh +1 -1
- data/features/package.feature +12 -6
- data/features/sandbox.feature +9 -5
- data/features/step_definitions/debify_steps.rb +1 -3
- data/features/support/env.rb +3 -1
- data/features/test.feature +4 -4
- data/lib/conjur/debify/Dockerfile.fpm +0 -4
- data/lib/conjur/debify/action/publish.rb +63 -20
- data/lib/conjur/debify/utils.rb +1 -1
- data/lib/conjur/debify.rb +161 -92
- data/lib/conjur/fpm/Dockerfile +5 -6
- data/lib/conjur/fpm/package.sh +61 -32
- data/lib/conjur/publish/Dockerfile +1 -7
- data/publish-rubygem.sh +1 -1
- data/spec/action/publish_spec.rb +4 -4
- data/spec/debify_utils_spec.rb +1 -1
- data/spec/utils_spec.rb +1 -1
- metadata +17 -17
data/lib/conjur/fpm/package.sh
CHANGED
@@ -8,47 +8,69 @@ version=$1
|
|
8
8
|
shift
|
9
9
|
|
10
10
|
if [ -z "$project_name" ]; then
|
11
|
-
|
12
|
-
|
11
|
+
echo Project name argument is required
|
12
|
+
exit 1
|
13
13
|
fi
|
14
14
|
if [ -z "$version" ]; then
|
15
|
-
|
16
|
-
|
15
|
+
echo Version argument is required
|
16
|
+
exit 1
|
17
17
|
fi
|
18
18
|
|
19
|
-
|
20
|
-
|
19
|
+
for i in "$@"; do
|
20
|
+
case $i in
|
21
|
+
-ft=* | --file-type=*)
|
22
|
+
file_type="${i#*=}"
|
23
|
+
shift
|
24
|
+
;;
|
25
|
+
esac
|
26
|
+
done
|
27
|
+
|
28
|
+
if [ -z "$file_type" ]; then
|
29
|
+
echo "No file type given. Using deb"
|
30
|
+
file_type=deb
|
31
|
+
fi
|
32
|
+
|
33
|
+
echo Project Name is $project_name
|
34
|
+
echo Version is $version
|
35
|
+
echo file_type is $file_type
|
36
|
+
echo params at the end are $@
|
21
37
|
|
22
38
|
# Build dev package first
|
23
|
-
echo Building $dev_package_name
|
24
39
|
prefix=/src/opt/conjur/project
|
25
|
-
cp -al $prefix /dev-pkg
|
26
40
|
cd $prefix
|
27
|
-
bundle --
|
41
|
+
bundle config set --local deployment 'true' && \
|
42
|
+
bundle config set --local path 'vendor/bundle' && \
|
43
|
+
bundle
|
44
|
+
cp -al $prefix /dev-pkg
|
45
|
+
bundle config set --local without 'development test'
|
28
46
|
bundle clean
|
29
|
-
cp /usr/local/bundle/config .bundle/config # bundler for some reason stores config there...
|
30
47
|
cd /dev-pkg
|
31
48
|
remove_matching $prefix
|
32
49
|
bundle_clean
|
33
50
|
|
34
|
-
if [
|
51
|
+
if [ $(ls | wc -l) -eq 0 ]; then
|
35
52
|
echo No dev dependencies, skipping dev package
|
36
53
|
else
|
37
|
-
|
38
|
-
|
39
|
-
|
54
|
+
echo "Building conjur-$project_name-dev $file_type package"
|
55
|
+
|
56
|
+
fpm \
|
57
|
+
-s dir \
|
58
|
+
-t $file_type \
|
59
|
+
-n conjur-$project_name-dev \
|
60
|
+
-v $version \
|
61
|
+
-C . \
|
62
|
+
--maintainer "CyberArk Software, Inc." \
|
63
|
+
--vendor "CyberArk Software, Inc." \
|
40
64
|
--license "Proprietary" \
|
41
|
-
--url "https://www.
|
65
|
+
--url "https://www.cyberark.com" \
|
42
66
|
--deb-no-default-config-files \
|
43
|
-
|
44
|
-
|
67
|
+
--$file_type-user conjur \
|
68
|
+
--$file_type-group conjur \
|
45
69
|
--depends "conjur-$project_name = $version" \
|
46
70
|
--prefix /opt/conjur/$project_name \
|
47
71
|
--description "Conjur $project_name service - development files"
|
48
72
|
fi
|
49
73
|
|
50
|
-
echo Building $package_name
|
51
|
-
|
52
74
|
mv /src/opt/conjur/project /src/opt/conjur/$project_name
|
53
75
|
|
54
76
|
cd /src/opt/conjur/$project_name
|
@@ -63,16 +85,23 @@ mkdir -p opt/conjur/etc
|
|
63
85
|
|
64
86
|
[ -d opt/conjur/"$project_name"/distrib ] && mv opt/conjur/"$project_name"/distrib /
|
65
87
|
|
66
|
-
|
67
|
-
|
68
|
-
|
69
|
-
|
70
|
-
|
71
|
-
|
72
|
-
|
73
|
-
|
74
|
-
|
75
|
-
|
76
|
-
|
77
|
-
|
78
|
-
|
88
|
+
echo "Building conjur-$project_name $file_type package"
|
89
|
+
|
90
|
+
fpm \
|
91
|
+
-s dir \
|
92
|
+
-t $file_type \
|
93
|
+
-n conjur-$project_name \
|
94
|
+
-v $version \
|
95
|
+
-C . \
|
96
|
+
--maintainer "CyberArk Software, Inc." \
|
97
|
+
--vendor "CyberArk Software, Inc." \
|
98
|
+
--license "Proprietary" \
|
99
|
+
--url "https://www.cyberark.com" \
|
100
|
+
--config-files opt/conjur/etc \
|
101
|
+
--deb-no-default-config-files \
|
102
|
+
--$file_type-user conjur \
|
103
|
+
--$file_type-group conjur \
|
104
|
+
--description "Conjur $project_name service" \
|
105
|
+
"$@"
|
106
|
+
|
107
|
+
ls -l
|
@@ -1,11 +1,5 @@
|
|
1
|
-
FROM
|
1
|
+
FROM releases-docker.jfrog.io/jfrog/jfrog-cli:1.52.0
|
2
2
|
|
3
3
|
ENV JFROG_CLI_OFFER_CONFIG=false
|
4
|
-
ENV JFROG_VERSION=1.13.1
|
5
|
-
|
6
|
-
RUN curl -kL \
|
7
|
-
-o /usr/bin/jfrog \
|
8
|
-
https://bintray.com/jfrog/jfrog-cli-go/download_file?file_path=${JFROG_VERSION}%2Fjfrog-cli-linux-amd64%2Fjfrog && \
|
9
|
-
chmod +x /usr/bin/jfrog
|
10
4
|
|
11
5
|
WORKDIR /src
|
data/publish-rubygem.sh
CHANGED
@@ -2,7 +2,7 @@
|
|
2
2
|
|
3
3
|
docker pull registry.tld/conjurinc/publish-rubygem
|
4
4
|
|
5
|
-
docker run -i --rm -v $PWD:/src -w /src alpine/git clean -fxd
|
5
|
+
docker run -i --rm -v $PWD:/src -w /src alpine/git clean -fxd -e VERSION
|
6
6
|
|
7
7
|
summon --yaml "RUBYGEMS_API_KEY: !var rubygems/api-key" \
|
8
8
|
docker run --rm --env-file @SUMMONENVFILE -v "$(pwd)":/opt/src \
|
data/spec/action/publish_spec.rb
CHANGED
@@ -31,8 +31,8 @@ describe Conjur::Debify::Action::Publish do
|
|
31
31
|
end
|
32
32
|
|
33
33
|
it 'runs' do
|
34
|
-
expect(action).to receive(:publish)
|
35
|
-
|
34
|
+
expect(action).to receive(:publish).twice
|
35
|
+
|
36
36
|
action.run
|
37
37
|
end
|
38
38
|
|
@@ -42,8 +42,8 @@ describe Conjur::Debify::Action::Publish do
|
|
42
42
|
|
43
43
|
it 'runs' do
|
44
44
|
expect(action).to receive(:fetch_art_creds)
|
45
|
-
expect(action).to receive(:publish)
|
46
|
-
|
45
|
+
expect(action).to receive(:publish).twice
|
46
|
+
|
47
47
|
action.run
|
48
48
|
end
|
49
49
|
end
|
data/spec/debify_utils_spec.rb
CHANGED
@@ -30,7 +30,7 @@ describe "remove_matching()", type: :aruba do
|
|
30
30
|
end
|
31
31
|
|
32
32
|
def remove_matching
|
33
|
-
|
33
|
+
run_command_and_stop "bash -c 'source #{DEBIFY_UTILS_PATH}; cd #{herepath}; remove_matching #{therepath}'"
|
34
34
|
end
|
35
35
|
|
36
36
|
def here files
|
data/spec/utils_spec.rb
CHANGED
@@ -6,7 +6,7 @@ describe 'Conjur::Debify::Utils.copy_from_container' do
|
|
6
6
|
it "copies a file from the container to the current directory" do
|
7
7
|
tar = File.read "#{__dir__}/data/test.tar"
|
8
8
|
container = instance_double Docker::Container
|
9
|
-
allow(container).to receive(:
|
9
|
+
allow(container).to receive(:archive_out).with "/tmp/test.tar" do |&b|
|
10
10
|
StringIO.new(tar).each(nil, 512) do |c|
|
11
11
|
# docker api sends three arguments, so emulate that
|
12
12
|
b[c, nil, nil]
|
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: 2.1.1.pre.957
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
|
-
-
|
7
|
+
- CyberArk Software, Inc.
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date:
|
11
|
+
date: 2021-12-31 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: gli
|
@@ -30,14 +30,14 @@ dependencies:
|
|
30
30
|
requirements:
|
31
31
|
- - "~>"
|
32
32
|
- !ruby/object:Gem::Version
|
33
|
-
version: '
|
33
|
+
version: '2.0'
|
34
34
|
type: :runtime
|
35
35
|
prerelease: false
|
36
36
|
version_requirements: !ruby/object:Gem::Requirement
|
37
37
|
requirements:
|
38
38
|
- - "~>"
|
39
39
|
- !ruby/object:Gem::Version
|
40
|
-
version: '
|
40
|
+
version: '2.0'
|
41
41
|
- !ruby/object:Gem::Dependency
|
42
42
|
name: conjur-cli
|
43
43
|
requirement: !ruby/object:Gem::Requirement
|
@@ -70,16 +70,16 @@ dependencies:
|
|
70
70
|
name: bundler
|
71
71
|
requirement: !ruby/object:Gem::Requirement
|
72
72
|
requirements:
|
73
|
-
- - "
|
73
|
+
- - ">="
|
74
74
|
- !ruby/object:Gem::Version
|
75
|
-
version:
|
75
|
+
version: 2.2.30
|
76
76
|
type: :development
|
77
77
|
prerelease: false
|
78
78
|
version_requirements: !ruby/object:Gem::Requirement
|
79
79
|
requirements:
|
80
|
-
- - "
|
80
|
+
- - ">="
|
81
81
|
- !ruby/object:Gem::Version
|
82
|
-
version:
|
82
|
+
version: 2.2.30
|
83
83
|
- !ruby/object:Gem::Dependency
|
84
84
|
name: fakefs
|
85
85
|
requirement: !ruby/object:Gem::Requirement
|
@@ -100,14 +100,14 @@ dependencies:
|
|
100
100
|
requirements:
|
101
101
|
- - "~>"
|
102
102
|
- !ruby/object:Gem::Version
|
103
|
-
version:
|
103
|
+
version: '13.0'
|
104
104
|
type: :development
|
105
105
|
prerelease: false
|
106
106
|
version_requirements: !ruby/object:Gem::Requirement
|
107
107
|
requirements:
|
108
108
|
- - "~>"
|
109
109
|
- !ruby/object:Gem::Version
|
110
|
-
version:
|
110
|
+
version: '13.0'
|
111
111
|
- !ruby/object:Gem::Dependency
|
112
112
|
name: cucumber
|
113
113
|
requirement: !ruby/object:Gem::Requirement
|
@@ -128,14 +128,14 @@ dependencies:
|
|
128
128
|
requirements:
|
129
129
|
- - "~>"
|
130
130
|
- !ruby/object:Gem::Version
|
131
|
-
version: '0
|
131
|
+
version: '1.0'
|
132
132
|
type: :development
|
133
133
|
prerelease: false
|
134
134
|
version_requirements: !ruby/object:Gem::Requirement
|
135
135
|
requirements:
|
136
136
|
- - "~>"
|
137
137
|
- !ruby/object:Gem::Version
|
138
|
-
version: '0
|
138
|
+
version: '1.0'
|
139
139
|
- !ruby/object:Gem::Dependency
|
140
140
|
name: rspec
|
141
141
|
requirement: !ruby/object:Gem::Requirement
|
@@ -166,7 +166,7 @@ dependencies:
|
|
166
166
|
version: '1.0'
|
167
167
|
description:
|
168
168
|
email:
|
169
|
-
-
|
169
|
+
- conj_maintainers@cyberark.com
|
170
170
|
executables:
|
171
171
|
- debify
|
172
172
|
extensions: []
|
@@ -246,11 +246,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
246
246
|
version: '0'
|
247
247
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
248
248
|
requirements:
|
249
|
-
- - "
|
249
|
+
- - ">"
|
250
250
|
- !ruby/object:Gem::Version
|
251
|
-
version:
|
251
|
+
version: 1.3.1
|
252
252
|
requirements: []
|
253
|
-
rubygems_version: 3.1.
|
253
|
+
rubygems_version: 3.1.6
|
254
254
|
signing_key:
|
255
255
|
specification_version: 4
|
256
256
|
summary: Utility commands to build and package Conjur services as Debian packages
|