miaou read show echo
This commit is contained in:
@@ -1,7 +1,7 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
function check_service_running() {
|
function check_service_running() {
|
||||||
lxc exec "$container" -- bash -c "docker ps --format '{{.Names}},{{.Ports}}' | grep $1 | grep $2"
|
lxc exec "$container" -- bash -c "docker ps --format '{{.Names}},{{.Ports}}' | grep $1 | grep -q $2"
|
||||||
}
|
}
|
||||||
|
|
||||||
function _read() {
|
function _read() {
|
||||||
@@ -10,7 +10,6 @@ function _read() {
|
|||||||
check_container "$container"
|
check_container "$container"
|
||||||
check_service_running "$longname" "$port"
|
check_service_running "$longname" "$port"
|
||||||
enable_trace
|
enable_trace
|
||||||
return 0
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function _create() {
|
function _create() {
|
||||||
|
|||||||
+1
-3
@@ -504,9 +504,7 @@ function build_services() {
|
|||||||
command="env MIAOU_BASEDIR=$MIAOU_BASEDIR MIAOU_CONFIGDIR=$MIAOU_CONFIGDIR $recipe --port $port --container $container --name $name --fqdn $fqdn --domain $domain --subdomain $subdomain"
|
command="env MIAOU_BASEDIR=$MIAOU_BASEDIR MIAOU_CONFIGDIR=$MIAOU_CONFIGDIR $recipe --port $port --container $container --name $name --fqdn $fqdn --domain $domain --subdomain $subdomain"
|
||||||
[[ "$data" != "null" ]] && command+=" --data \"$data\""
|
[[ "$data" != "null" ]] && command+=" --data \"$data\""
|
||||||
|
|
||||||
# eval "$command -r" # USEFUL for debugging when read fails!!!
|
if ! eval "$command -r"; then
|
||||||
|
|
||||||
if ! eval "$command -r" >/dev/null; then
|
|
||||||
echoinfo "CREATE RECIPE"
|
echoinfo "CREATE RECIPE"
|
||||||
|
|
||||||
# echo "$command -c"
|
# echo "$command -c"
|
||||||
|
|||||||
Reference in New Issue
Block a user