dockersitter 0.4.0 → 0.5.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/gemspec.yml +1 -1
- data/install_certificate.tar +0 -0
- data/lib/commands/init.rb +9 -2
- data/lib/docker_mgr/version.rb +1 -1
- data/lib/templates/gitignore +3 -0
- data/lib/templates/install_certificate/add_ca.sh +31 -0
- data/lib/util.rb +18 -1
- metadata +7 -4
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 89d3334696ea7dc741c3ca772685124f79c33655
|
4
|
+
data.tar.gz: e936e5a47c0017cb200e0a1dd980900973fca9e4
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: d2c4e9b173621119953d35078898be6b827b39d5ea06f2049f5b466ddde18952fcab0f450864da0f75ba73529cfe3813c8309f231877b5b26048eaa87b8fae31
|
7
|
+
data.tar.gz: 89d05cd37919da618b2982209c4ab7756a77ae596f050b6890be7bfeda0eb717a8d2dc8b668aa5d6135b1cc52ee8ed2ba2fceb652917861ae07a1a3cd69bb054
|
data/gemspec.yml
CHANGED
Binary file
|
data/lib/commands/init.rb
CHANGED
@@ -1,8 +1,10 @@
|
|
1
1
|
require "thor/group"
|
2
2
|
require 'fileutils'
|
3
|
+
require 'util'
|
3
4
|
|
4
5
|
class Init < Thor::Group
|
5
6
|
include Thor::Actions
|
7
|
+
include DockerMgr::Util
|
6
8
|
|
7
9
|
def self.source_root
|
8
10
|
File.expand_path('../templates',__dir__)
|
@@ -17,12 +19,17 @@ class Init < Thor::Group
|
|
17
19
|
empty_directory "docker/ci_runner"
|
18
20
|
empty_directory "docker/proxy/certs"
|
19
21
|
empty_directory "docker/proxy/vhosts.d"
|
20
|
-
|
22
|
+
copy_file "gitignore","docker/.gitignore"
|
21
23
|
FileUtils.cd 'docker/admin/ca' do
|
22
24
|
puts `openssl req -x509 -newkey rsa:4096 -keyout rootCA.key -out rootCA.crt -days 7800 -sha256`
|
23
25
|
end
|
24
|
-
chmod 'docker/admin/ca/
|
26
|
+
chmod 'docker/admin/ca/rootCA.key',0600
|
27
|
+
chmod 'docker/admin/ca/sign.sh',0755
|
25
28
|
puts `git init docker`
|
29
|
+
FileUtils.cd 'docker' do
|
30
|
+
puts FileUtils.pwd
|
31
|
+
generate_ca_installer
|
32
|
+
end
|
26
33
|
end
|
27
34
|
|
28
35
|
end
|
data/lib/docker_mgr/version.rb
CHANGED
@@ -0,0 +1,31 @@
|
|
1
|
+
#!/bin/bash
|
2
|
+
|
3
|
+
cert="$(dirname $0)/rootCA.crt"
|
4
|
+
|
5
|
+
function mac {
|
6
|
+
sudo security add-trusted-cert -d -r trustRoot -k /Library/Keychains/System.keychain $cert
|
7
|
+
}
|
8
|
+
|
9
|
+
function linux {
|
10
|
+
distribution=$(find /etc/*-release -type f | xargs cat | grep 'ID' | head -n1 | awk -F'=' '{gsub(/"/,"",$2); print tolower($2)}')
|
11
|
+
echo $distribution
|
12
|
+
case $distribution in
|
13
|
+
debian|ubuntu|linuxmint*|elementary*)
|
14
|
+
echo "hier"
|
15
|
+
sudo cp $cert /usr/local/share/ca-certificates/richterrettich.crt
|
16
|
+
sudo update-ca-certificates;;
|
17
|
+
fedora|centos)
|
18
|
+
sudo cp $cert /etc/pki/ca-trust/source/anchors
|
19
|
+
sudo update-ca-trust;;
|
20
|
+
esac
|
21
|
+
}
|
22
|
+
|
23
|
+
|
24
|
+
case $OSTYPE in
|
25
|
+
darwin*) mac
|
26
|
+
;;
|
27
|
+
linux-gnu*) linux
|
28
|
+
;;
|
29
|
+
esac
|
30
|
+
|
31
|
+
|
data/lib/util.rb
CHANGED
@@ -59,7 +59,7 @@ module DockerMgr
|
|
59
59
|
end
|
60
60
|
|
61
61
|
def vhost_dir
|
62
|
-
"#{proxy_dir}/
|
62
|
+
"#{proxy_dir}/vhosts.d"
|
63
63
|
end
|
64
64
|
|
65
65
|
def config
|
@@ -147,5 +147,22 @@ module DockerMgr
|
|
147
147
|
extract_git_variable("user.name")
|
148
148
|
end
|
149
149
|
|
150
|
+
def generate_ca_installer
|
151
|
+
directory "install_certificate","#{root_dir}/install_certificate"
|
152
|
+
FileUtils.cp "#{admin_dir}/ca/rootCA.crt","install_certificate"
|
153
|
+
package_tar "install_certificate"
|
154
|
+
FileUtils.rm_rf "install_certificate"
|
155
|
+
end
|
156
|
+
|
157
|
+
def package_tar(dir_name,current_dir = nil)
|
158
|
+
if current_dir
|
159
|
+
`tar -cf #{dir_name}.tar -C #{current_dir} #{dir_name}`
|
160
|
+
else
|
161
|
+
`tar -cf #{dir_name}.tar #{dir_name}`
|
162
|
+
end
|
163
|
+
end
|
164
|
+
|
165
|
+
|
166
|
+
|
150
167
|
end
|
151
168
|
end
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: dockersitter
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.
|
4
|
+
version: 0.5.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Rene Richter
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2015-08-
|
11
|
+
date: 2015-08-20 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: thor
|
@@ -44,14 +44,14 @@ dependencies:
|
|
44
44
|
requirements:
|
45
45
|
- - "~>"
|
46
46
|
- !ruby/object:Gem::Version
|
47
|
-
version: '
|
47
|
+
version: '10.4'
|
48
48
|
type: :development
|
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: '10.4'
|
55
55
|
- !ruby/object:Gem::Dependency
|
56
56
|
name: rdoc
|
57
57
|
requirement: !ruby/object:Gem::Requirement
|
@@ -117,6 +117,7 @@ files:
|
|
117
117
|
- bin/dockersitter
|
118
118
|
- docker_mgr.gemspec
|
119
119
|
- gemspec.yml
|
120
|
+
- install_certificate.tar
|
120
121
|
- lib/command_router.rb
|
121
122
|
- lib/commands/backup_app.rb
|
122
123
|
- lib/commands/config.rb
|
@@ -149,6 +150,8 @@ files:
|
|
149
150
|
- lib/templates/before_all_restore.erb
|
150
151
|
- lib/templates/build.erb
|
151
152
|
- lib/templates/docker-compose.yml.erb
|
153
|
+
- lib/templates/gitignore
|
154
|
+
- lib/templates/install_certificate/add_ca.sh
|
152
155
|
- lib/templates/restore.erb
|
153
156
|
- lib/util.rb
|
154
157
|
- spec/docker_mgr_spec.rb
|