chore: minor cleanup to container and argument handling

This commit is contained in:
Jose Diaz-Gonzalez committed 2018-04-06 22:53:02 -04:00
1 parent 85b00385a4
commit 867e3317aa
7 files changed
+12 -10

No files matched your search

@@ -4,7 +4,9 @@ source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
dokku_cleanup_cmd() { dokku_cleanup_cmd() {
declare desc="cleans up old deployment cruft" declare desc="cleans up old deployment cruft"
local cmd="cleanup" declare cmd="cleanup"
[[ "$1" == "$cmd" ]] && shift 1
declare APP="$1"
docker_cleanup "$APP" "true" docker_cleanup "$APP" "true"
} }
+2 -2
View File
@@ -105,7 +105,7 @@ func GetDeployingAppImageName(appName, imageTag, imageRepo string) (imageName st
imageName = fmt.Sprintf("%s%s:%s", imageRemoteRepository, imageRepo, imageTag) imageName = fmt.Sprintf("%s%s:%s", imageRemoteRepository, imageRepo, imageTag)
if !VerifyImage(imageName) { if !VerifyImage(imageName) {
LogFail(fmt.Sprintf("app image (%s) not found", imageName)) LogFail(fmt.Sprintf("App image (%s) not found", imageName))
} }
return return
} }
@@ -221,7 +221,7 @@ func GetAppImageName(appName, imageTag, imageRepo string) (imageName string) {
} else { } else {
imageName = fmt.Sprintf("%v:%v", imageRepo, imageTag) imageName = fmt.Sprintf("%v:%v", imageRepo, imageTag)
if !VerifyImage(imageName) { if !VerifyImage(imageName) {
LogFail(fmt.Sprintf("app image (%s) not found", imageName)) LogFail(fmt.Sprintf("App image (%s) not found", imageName))
} }
} }
return return
+3 -3
View File
@@ -192,7 +192,7 @@ get_deploying_app_image_name() {
[[ -z "$IMAGE_TAG" ]] && IMAGE_TAG="latest" [[ -z "$IMAGE_TAG" ]] && IMAGE_TAG="latest"
local IMAGE="${IMAGE_REMOTE_REPOSITORY}${IMAGE_REPO}:${IMAGE_TAG}" local IMAGE="${IMAGE_REMOTE_REPOSITORY}${IMAGE_REPO}:${IMAGE_TAG}"
verify_image "$IMAGE" || dokku_log_fail "app image ($IMAGE) not found" verify_image "$IMAGE" || dokku_log_fail "App image ($IMAGE) not found"
echo "$IMAGE" echo "$IMAGE"
} }
@@ -207,7 +207,7 @@ get_app_image_name() {
if [[ -n "$IMAGE_TAG" ]]; then if [[ -n "$IMAGE_TAG" ]]; then
local IMAGE="$IMAGE_REPO:$IMAGE_TAG" local IMAGE="$IMAGE_REPO:$IMAGE_TAG"
verify_image "$IMAGE" || dokku_log_fail "app image ($IMAGE) not found" verify_image "$IMAGE" || dokku_log_fail "App image ($IMAGE) not found"
else else
local IMAGE="$IMAGE_REPO:latest" local IMAGE="$IMAGE_REPO:latest"
fi fi
@@ -402,7 +402,7 @@ is_container_status() {
declare desc="return 0 if given docker container id is in given state" declare desc="return 0 if given docker container id is in given state"
local CID=$1 local CID=$1
local TEMPLATE="{{.State.$2}}" local TEMPLATE="{{.State.$2}}"
local CONTAINER_STATUS=$(docker inspect -f "$TEMPLATE" "$CID" || true) local CONTAINER_STATUS=$(docker inspect -f "$TEMPLATE" "$CID" 2> /dev/null || true)
if [[ "$CONTAINER_STATUS" == "true" ]]; then if [[ "$CONTAINER_STATUS" == "true" ]]; then
return 0 return 0
+1 -1
View File
@@ -40,7 +40,7 @@ report_single_app() {
local APP_CONTAINER_STATUS local APP_CONTAINER_STATUS
for CONTAINER_FILE in $CONTAINER_FILES; do for CONTAINER_FILE in $CONTAINER_FILES; do
CID=$(< "$DOKKU_ROOT/$APP/$CONTAINER_FILE") CID=$(< "$DOKKU_ROOT/$APP/$CONTAINER_FILE")
APP_CONTAINER_STATUS=$(docker inspect -f '{{.State.Status}}' "$CID" 2> /dev/null) APP_CONTAINER_STATUS=$(docker inspect -f '{{.State.Status}}' "$CID" 2> /dev/null || true)
[[ -z "$APP_CONTAINER_STATUS" ]] && APP_CONTAINER_STATUS="missing" [[ -z "$APP_CONTAINER_STATUS" ]] && APP_CONTAINER_STATUS="missing"
STATUSES+=("${CONTAINER_FILE#*.}:$APP_CONTAINER_STATUS#${CID:0:12}") STATUSES+=("${CONTAINER_FILE#*.}:$APP_CONTAINER_STATUS#${CID:0:12}")
done done
+1 -1
View File
@@ -20,7 +20,7 @@ scheduler-docker-local-post-delete() {
local DOKKU_APP_CIDS=$(docker ps -a --no-trunc | egrep "dokku/${APP}:" | awk '{ print $1 }' | xargs) local DOKKU_APP_CIDS=$(docker ps -a --no-trunc | egrep "dokku/${APP}:" | awk '{ print $1 }' | xargs)
if [[ -n "$DOKKU_APP_CIDS" ]]; then if [[ -n "$DOKKU_APP_CIDS" ]]; then
# shellcheck disable=SC2086 # shellcheck disable=SC2086
docker rm -f $DOKKU_APP_CIDS &>/dev/null || true docker rm -f $DOKKU_APP_CIDS > /dev/null 2>&1 || true
fi fi
# shellcheck disable=SC2046 # shellcheck disable=SC2046
@@ -27,7 +27,7 @@ scheduler-docker-local-scheduler-stop() {
if [[ -n "$DOKKU_APP_CIDS" ]]; then if [[ -n "$DOKKU_APP_CIDS" ]]; then
# shellcheck disable=SC2086 # shellcheck disable=SC2086
docker rm -f $DOKKU_APP_CIDS > /dev/null || true docker rm -f $DOKKU_APP_CIDS > /dev/null 2>&1 || true
fi fi
fi fi
} }
+1 -1
View File
@@ -142,7 +142,7 @@ teardown() {
echo "status: "$status echo "status: "$status
assert_success assert_success
run bash -c "dokku --trace ps:restore" run bash -c "dokku ps:restore"
echo "output: "$output echo "output: "$output
echo "status: "$status echo "status: "$status
assert_success assert_success