docker-utils 0.1.14 → 0.1.15
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/share/scripts/define-service +5 -15
- 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: 9347d302719db760ad98d5b6a125cf05337e27ce
|
|
4
|
+
data.tar.gz: 92b4803d126fe2fe59b43055902b66c667506e01
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 7bb8b2014bdff5fc1186b854c66f71403ebf5ddf1d1ebd3939fc0e0b7404816e5468458d7f82e6482ffb67c6886fde71b4fe89f5b82e4c3fba40d8c2c8bb04c6
|
|
7
|
+
data.tar.gz: ea329bc7b05fa2e4e7e47a7fcea358cc565c83ae2092f65c3458861581a0ea7b02be8d58264e0f754c4fed38f02d67ccf9f6c5843d4c249a33761c109de8d548
|
|
@@ -14,6 +14,7 @@ dependencies=""
|
|
|
14
14
|
volumes=""
|
|
15
15
|
published_ports=""
|
|
16
16
|
misc_args=""
|
|
17
|
+
command_args=()
|
|
17
18
|
|
|
18
19
|
while [ "$#" -gt 0 ]; do
|
|
19
20
|
case "$1" in
|
|
@@ -36,6 +37,9 @@ while [ "$#" -gt 0 ]; do
|
|
|
36
37
|
--before-start)
|
|
37
38
|
shift; before_start_script="$1"; shift
|
|
38
39
|
;;
|
|
40
|
+
--cmd-arg)
|
|
41
|
+
shift; command_args+=($1); shift
|
|
42
|
+
;;
|
|
39
43
|
*)
|
|
40
44
|
misc_arg="$1"; shift
|
|
41
45
|
misc_args="${misc_args} ${misc_arg}"
|
|
@@ -56,12 +60,6 @@ done
|
|
|
56
60
|
|
|
57
61
|
service_name="${image_name}"
|
|
58
62
|
|
|
59
|
-
if [ -n "$LOGENTRIES_ACCOUNT_KEY" ]; then
|
|
60
|
-
touch "/var/log/upstart/${service_name}.log"
|
|
61
|
-
le follow --name="${service_name}" "/var/log/upstart/${service_name}.log" 2>/dev/null 1>&2
|
|
62
|
-
service logentries restart 2>/dev/null 1>&2
|
|
63
|
-
fi
|
|
64
|
-
|
|
65
63
|
cat >"/etc/init/${service_name}.conf" <<EOF
|
|
66
64
|
#stop on (${stopping_stanza})
|
|
67
65
|
stop on stopping docker
|
|
@@ -110,15 +108,6 @@ script
|
|
|
110
108
|
done
|
|
111
109
|
fi
|
|
112
110
|
|
|
113
|
-
echo "-> docker run -d \
|
|
114
|
-
--name=\"\${container_name}\" \
|
|
115
|
-
--volumes-from=\"${data_container_name}\" \
|
|
116
|
-
-e "BEXNG_TARGET_SYSTEM=\${DOMAIN}" \
|
|
117
|
-
\${published_port_args} \
|
|
118
|
-
\${link_args} \
|
|
119
|
-
${misc_args} \
|
|
120
|
-
\"${image_repo}:${image_tag}\""
|
|
121
|
-
|
|
122
111
|
running_container_id=\$(docker run -d \
|
|
123
112
|
--name="\${container_name}" \
|
|
124
113
|
--volumes-from="${data_container_name}" \
|
|
@@ -127,6 +116,7 @@ script
|
|
|
127
116
|
\${link_args} \
|
|
128
117
|
${misc_args} \
|
|
129
118
|
"${image_repo}:${image_tag}" \
|
|
119
|
+
${command_args[@]} \
|
|
130
120
|
)
|
|
131
121
|
|
|
132
122
|
exec docker attach --sig-proxy=true "\${running_container_id}"
|