teamd-installer 0.0.21 → 0.0.22
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/docker/Dockerfile +1 -1
- data/lib/teamd/installer/template_config.rb +7 -3
- data/lib/teamd/installer/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: dee573ce7e3c560c5e1e2c73435670f0cc78079e
|
|
4
|
+
data.tar.gz: 79f446c5edb01db6ab73a4ee06bfb30882eb9b2d
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 4036ef2da5ff42f1c465bb06419df22e23fcd4e1d24988b8ad42e05cabdc31fc0e51856d8da0b20a0a2a02d54ee303d3605658c3b54e5d1f3c42165a833d56a5
|
|
7
|
+
data.tar.gz: 6b3d07a6e7cad554f5b2c2163bdc8df69aa3b3a4dac7b73954e97bc407e22d8131e6d7ab209f8ff4c820f34fd1e8bbc58ef75b4a22af6a3fe157bf51378a3a5a
|
data/docker/Dockerfile
CHANGED
|
@@ -4,6 +4,6 @@ MAINTAINER Mathias Kaufmann <me@stei.gr>
|
|
|
4
4
|
RUN apk update && \
|
|
5
5
|
apk add ruby ruby-dev ca-certificates bash wget gnupg util-linux coreutils bzip2 && \
|
|
6
6
|
gem update --system --no-ri --no-rdoc
|
|
7
|
-
RUN gem install --no-ri --no-rdoc --version 0.0.
|
|
7
|
+
RUN gem install --no-ri --no-rdoc --version 0.0.22 teamd-installer
|
|
8
8
|
|
|
9
9
|
ENTRYPOINT ["/usr/bin/teamd-installer"]
|
|
@@ -24,7 +24,12 @@ module Teamd
|
|
|
24
24
|
output["coreos"]["units"] << {
|
|
25
25
|
"name" => "teamd-etcd-cloudinit-reuse.service",
|
|
26
26
|
"command" => "start",
|
|
27
|
-
"content" => "[Unit]\nDescription=Teamd
|
|
27
|
+
"content" => "[Unit]\nDescription=Teamd Etcd Unit Reuse\nDocumentation=https://teamd.stei.gr/discover\nConditionPathExists=/run/systemd/system/etcd.service.d\n\n[Service]\nType=oneshot\nExecStart=/usr/bin/ln -s /run/systemd/system/etcd.service.d /etc/systemd/system/teamd-discover.service.d",
|
|
28
|
+
}
|
|
29
|
+
output["coreos"]["units"] << {
|
|
30
|
+
"name" => "teamd-etcd2-cloudinit-reuse.service",
|
|
31
|
+
"command" => "start",
|
|
32
|
+
"content" => "[Unit]\nDescription=Teamd Etcd2 Unit Reuse\nDocumentation=https://teamd.stei.gr/discover\nConditionPathExists=/run/systemd/system/etcd2.service.d\n\n[Service]\nType=oneshot\nExecStart=/usr/bin/ln -s /run/systemd/system/etcd2.service.d /etc/systemd/system/teamd-discover.service.d",
|
|
28
33
|
}
|
|
29
34
|
else
|
|
30
35
|
puts "Create Unit for publishing discovery token"
|
|
@@ -40,7 +45,7 @@ module Teamd
|
|
|
40
45
|
output["coreos"]["units"] << {
|
|
41
46
|
"name" => "teamd-discover.service",
|
|
42
47
|
"command" => "start",
|
|
43
|
-
"content" => "[Unit]\nDescription=Teamd Local Discover Publisher\nDocumentation=https://teamd.stei.gr/discover\nAfter=early-docker.service\nRequires=early-docker.service\n\n[Service]\nRestart=always\nRestartSec=5\nEnvironment=\"DOCKER_HOST=unix:///var/run/early-docker.sock\"\nEnvironmentFile=-/run/teamd/etcd.env\nExecStartPre=/usr/bin/docker pull steigr/teamd-discover\nExecStart=/usr/bin/docker run -t --rm --net=host \\\n --env=\"ETCD_DISCOVERY=${ETCD_DISCOVERY}\" \\\n steigr/teamd-discover",
|
|
48
|
+
"content" => "[Unit]\nDescription=Teamd Local Discover Publisher\nDocumentation=https://teamd.stei.gr/discover\nAfter=early-docker.service\nRequires=early-docker.service\nBefore=early-docker.target\n\n[Service]\nRestart=always\nRestartSec=5\nEnvironment=\"DOCKER_HOST=unix:///var/run/early-docker.sock\"\nEnvironmentFile=-/run/teamd/etcd.env\nExecStartPre=/usr/bin/docker pull steigr/teamd-discover\nExecStart=/usr/bin/docker run -t --rm --net=host \\\n --env=\"ETCD_DISCOVERY=${ETCD_DISCOVERY}\" \\\n steigr/teamd-discover",
|
|
44
49
|
}
|
|
45
50
|
puts "Start Etcd2 at startup"
|
|
46
51
|
output["coreos"]["units"] << {
|
|
@@ -65,7 +70,6 @@ module Teamd
|
|
|
65
70
|
}
|
|
66
71
|
output["coreos"]["units"] << {
|
|
67
72
|
"name" => "remove-sshd-socket.service",
|
|
68
|
-
"command" => "start",
|
|
69
73
|
"content" => "[Unit]\nDescription=Remove SSHd Socket before reboot\nBefore=shutdown.target reboot.target halt.target\nDefaultDependencies=no\n\n[Service]\nType=oneshot\nExecStart=/usr/bin/rm /etc/systemd/system/sshd.socket",
|
|
70
74
|
}
|
|
71
75
|
end
|