feat: integrate resource plugin with scheduler-docker-local
This commit is contained in:
@@ -1199,6 +1199,22 @@ fi
|
|||||||
plugn trigger receive-app $APP $newrev
|
plugn trigger receive-app $APP $newrev
|
||||||
```
|
```
|
||||||
|
|
||||||
|
### `resource-get-property`
|
||||||
|
|
||||||
|
- Description: Fetches a given resource property value
|
||||||
|
- Invoked by:
|
||||||
|
- Arguments: `$APP` `$PROC_TYPE` `$RESOURCE_TYPE` `$PROPERTY`
|
||||||
|
- Example:
|
||||||
|
|
||||||
|
```shell
|
||||||
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
|
set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
|
||||||
|
APP="$1"; PROC_TYPE="$2" RESOURCE_TYPE="$3" PROPERTY="$4"
|
||||||
|
|
||||||
|
# TODO
|
||||||
|
```
|
||||||
|
|
||||||
### `retire-container-failed`
|
### `retire-container-failed`
|
||||||
|
|
||||||
- Description: Allows you to run commands if/when retiring old containers has failed
|
- Description: Allows you to run commands if/when retiring old containers has failed
|
||||||
|
|||||||
@@ -83,6 +83,10 @@ execute_script() {
|
|||||||
# strip --restart args from DOCKER_ARGS
|
# strip --restart args from DOCKER_ARGS
|
||||||
local DOCKER_ARGS=$(sed -e "s/--restart=[[:graph:]]\+[[:blank:]]\?//g" <<<"$DOCKER_ARGS")
|
local DOCKER_ARGS=$(sed -e "s/--restart=[[:graph:]]\+[[:blank:]]\?//g" <<<"$DOCKER_ARGS")
|
||||||
|
|
||||||
|
local IMAGE_SOURCE_TYPE="dockerfile"
|
||||||
|
is_image_herokuish_based "$IMAGE" && IMAGE_SOURCE_TYPE="herokuish"
|
||||||
|
DOCKER_ARGS+=$(: | plugn trigger docker-args-process-deploy "$APP" "$IMAGE_TAG" "$IMAGE_SOURCE_TYPE" "$PHASE_SCRIPT_KEY")
|
||||||
|
|
||||||
# eval args as array to respect escapes
|
# eval args as array to respect escapes
|
||||||
declare -a ARG_ARRAY
|
declare -a ARG_ARRAY
|
||||||
eval "ARG_ARRAY=($DOCKER_ARGS)"
|
eval "ARG_ARRAY=($DOCKER_ARGS)"
|
||||||
|
|||||||
@@ -533,6 +533,9 @@ dokku_build() {
|
|||||||
|
|
||||||
local DOCKER_ARGS=$(: | plugn trigger docker-args-build "$APP" "$IMAGE_SOURCE_TYPE")
|
local DOCKER_ARGS=$(: | plugn trigger docker-args-build "$APP" "$IMAGE_SOURCE_TYPE")
|
||||||
[[ "$DOKKU_TRACE" ]] && DOCKER_ARGS+=" -e TRACE=true "
|
[[ "$DOKKU_TRACE" ]] && DOCKER_ARGS+=" -e TRACE=true "
|
||||||
|
local IMAGE_SOURCE_TYPE="herokuish"
|
||||||
|
DOCKER_ARGS+=$(: | plugn trigger docker-args-process-run "$APP" "$IMAGE_TAG" "$IMAGE_SOURCE_TYPE" "$PHASE_SCRIPT_KEY")
|
||||||
|
|
||||||
declare -a ARG_ARRAY
|
declare -a ARG_ARRAY
|
||||||
eval "ARG_ARRAY=($DOCKER_ARGS)"
|
eval "ARG_ARRAY=($DOCKER_ARGS)"
|
||||||
# shellcheck disable=SC2086
|
# shellcheck disable=SC2086
|
||||||
@@ -558,6 +561,9 @@ dokku_build() {
|
|||||||
|
|
||||||
[[ "$DOKKU_DOCKERFILE_CACHE_BUILD" == "false" ]] && DOKKU_DOCKER_BUILD_OPTS="$DOKKU_DOCKER_BUILD_OPTS --no-cache"
|
[[ "$DOKKU_DOCKERFILE_CACHE_BUILD" == "false" ]] && DOKKU_DOCKER_BUILD_OPTS="$DOKKU_DOCKER_BUILD_OPTS --no-cache"
|
||||||
local DOCKER_ARGS=$(: | plugn trigger docker-args-build "$APP" "$IMAGE_SOURCE_TYPE")
|
local DOCKER_ARGS=$(: | plugn trigger docker-args-build "$APP" "$IMAGE_SOURCE_TYPE")
|
||||||
|
local IMAGE_SOURCE_TYPE="dockerfile"
|
||||||
|
DOCKER_ARGS+=$(: | plugn trigger docker-args-process-run "$APP" "$IMAGE_TAG" "$IMAGE_SOURCE_TYPE" "$PHASE_SCRIPT_KEY")
|
||||||
|
|
||||||
# strip --volume and -v args from DOCKER_ARGS
|
# strip --volume and -v args from DOCKER_ARGS
|
||||||
local DOCKER_ARGS=$(sed -e "s/--volume=[[:graph:]]\+[[:blank:]]\?//g" -e "s/-v[[:blank:]]\?[[:graph:]]\+[[:blank:]]\?//g" <<<"$DOCKER_ARGS")
|
local DOCKER_ARGS=$(sed -e "s/--volume=[[:graph:]]\+[[:blank:]]\?//g" -e "s/-v[[:blank:]]\?[[:graph:]]\+[[:blank:]]\?//g" <<<"$DOCKER_ARGS")
|
||||||
declare -a ARG_ARRAY
|
declare -a ARG_ARRAY
|
||||||
|
|||||||
@@ -25,6 +25,8 @@ scheduler-docker-local-scheduler-deploy() {
|
|||||||
plugn trigger pre-deploy "$APP" "$IMAGE_TAG"
|
plugn trigger pre-deploy "$APP" "$IMAGE_TAG"
|
||||||
|
|
||||||
is_image_herokuish_based "$IMAGE" && DOKKU_HEROKUISH=true
|
is_image_herokuish_based "$IMAGE" && DOKKU_HEROKUISH=true
|
||||||
|
local IMAGE_SOURCE_TYPE="dockerfile"
|
||||||
|
[[ "$DOKKU_HEROKUISH" == "true" ]] && IMAGE_SOURCE_TYPE="herokuish"
|
||||||
local DOKKU_SCALE_FILE="$DOKKU_ROOT/$APP/DOKKU_SCALE"
|
local DOKKU_SCALE_FILE="$DOKKU_ROOT/$APP/DOKKU_SCALE"
|
||||||
local oldids=$(get_app_container_ids "$APP")
|
local oldids=$(get_app_container_ids "$APP")
|
||||||
|
|
||||||
@@ -69,6 +71,7 @@ scheduler-docker-local-scheduler-deploy() {
|
|||||||
local DOCKER_ARGS
|
local DOCKER_ARGS
|
||||||
DOCKER_ARGS=$(: | plugn trigger docker-args-deploy "$APP" "$IMAGE_TAG" "$PROC_TYPE" "$CONTAINER_INDEX")
|
DOCKER_ARGS=$(: | plugn trigger docker-args-deploy "$APP" "$IMAGE_TAG" "$PROC_TYPE" "$CONTAINER_INDEX")
|
||||||
DOCKER_ARGS+=" -e DYNO=$PROC_TYPE.$CONTAINER_INDEX "
|
DOCKER_ARGS+=" -e DYNO=$PROC_TYPE.$CONTAINER_INDEX "
|
||||||
|
DOCKER_ARGS+=$(: | plugn trigger docker-args-process-deploy "$APP" "$IMAGE_TAG" "$IMAGE_SOURCE_TYPE" "$PROC_TYPE" "$CONTAINER_INDEX")
|
||||||
[[ "$DOKKU_TRACE" ]] && DOCKER_ARGS+=" -e TRACE=true "
|
[[ "$DOKKU_TRACE" ]] && DOCKER_ARGS+=" -e TRACE=true "
|
||||||
|
|
||||||
declare -a ARG_ARRAY
|
declare -a ARG_ARRAY
|
||||||
|
|||||||
@@ -27,6 +27,10 @@ scheduler-docker-local-scheduler-run() {
|
|||||||
local DOCKER_ARGS=$(: | plugn trigger docker-args-run "$APP" "$IMAGE_TAG")
|
local DOCKER_ARGS=$(: | plugn trigger docker-args-run "$APP" "$IMAGE_TAG")
|
||||||
[[ "$DOKKU_TRACE" ]] && local DOCKER_ARGS+=" -e TRACE=true "
|
[[ "$DOKKU_TRACE" ]] && local DOCKER_ARGS+=" -e TRACE=true "
|
||||||
|
|
||||||
|
local IMAGE_SOURCE_TYPE="dockerfile"
|
||||||
|
is_image_herokuish_based "$IMAGE" && IMAGE_SOURCE_TYPE="herokuish"
|
||||||
|
DOCKER_ARGS+=$(: | plugn trigger docker-args-process-run "$APP" "$IMAGE_TAG" "$IMAGE_SOURCE_TYPE" "$PHASE_SCRIPT_KEY")
|
||||||
|
|
||||||
declare -a ARG_ARRAY
|
declare -a ARG_ARRAY
|
||||||
eval "ARG_ARRAY=($DOCKER_ARGS)"
|
eval "ARG_ARRAY=($DOCKER_ARGS)"
|
||||||
|
|
||||||
@@ -38,7 +42,7 @@ scheduler-docker-local-scheduler-run() {
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
has_tty && DOKKU_RUN_OPTS+=" -i -t"
|
has_tty && DOKKU_RUN_OPTS+=" -i -t"
|
||||||
is_image_herokuish_based "$IMAGE" && local EXEC_CMD="/exec"
|
[[ "$IMAGE_SOURCE_TYPE" == "herokuish" ]] && local EXEC_CMD="/exec"
|
||||||
|
|
||||||
DOKKU_QUIET_OUTPUT=1 extract_procfile "$APP"
|
DOKKU_QUIET_OUTPUT=1 extract_procfile "$APP"
|
||||||
|
|
||||||
|
|||||||
4
tests/unit/10_apps.bats
Executable file → Normal file
4
tests/unit/10_apps.bats
Executable file → Normal file
@@ -2,11 +2,11 @@
|
|||||||
|
|
||||||
load test_helper
|
load test_helper
|
||||||
|
|
||||||
setup () {
|
setup() {
|
||||||
global_setup
|
global_setup
|
||||||
}
|
}
|
||||||
|
|
||||||
teardown () {
|
teardown() {
|
||||||
global_teardown
|
global_teardown
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
137
tests/unit/20_resource.bats
Normal file
137
tests/unit/20_resource.bats
Normal file
@@ -0,0 +1,137 @@
|
|||||||
|
#!/usr/bin/env bats
|
||||||
|
|
||||||
|
load test_helper
|
||||||
|
|
||||||
|
setup() {
|
||||||
|
global_setup
|
||||||
|
create_app
|
||||||
|
}
|
||||||
|
|
||||||
|
teardown() {
|
||||||
|
destroy_app
|
||||||
|
global_teardown
|
||||||
|
}
|
||||||
|
|
||||||
|
@test "(docker-options) resource:limit" {
|
||||||
|
run /bin/bash -c "dokku resource:limit $TEST_APP"
|
||||||
|
echo "output: $output"
|
||||||
|
echo "status: $status"
|
||||||
|
assert_output_contains "resource limits $TEST_APP information"
|
||||||
|
|
||||||
|
deploy_app
|
||||||
|
run /bin/bash -c "dokku resource:limit --memory 512MB $TEST_APP"
|
||||||
|
echo "output: $output"
|
||||||
|
echo "status: $status"
|
||||||
|
assert_success
|
||||||
|
|
||||||
|
CID=$(< $DOKKU_ROOT/$TEST_APP/CONTAINER.web.1)
|
||||||
|
run /bin/bash -c "docker inspect --format '{{.HostConfig.Memory}}' $CID"
|
||||||
|
echo "output: $output"
|
||||||
|
echo "status: $status"
|
||||||
|
assert_output "0"
|
||||||
|
|
||||||
|
dokku ps:rebuild "$TEST_APP"
|
||||||
|
CID=$(< $DOKKU_ROOT/$TEST_APP/CONTAINER.web.1)
|
||||||
|
run /bin/bash -c "docker inspect --format '{{.HostConfig.Memory}}' $CID"
|
||||||
|
echo "output: $output"
|
||||||
|
echo "status: $status"
|
||||||
|
assert_output "536870912"
|
||||||
|
|
||||||
|
run /bin/bash -c "dokku resource:limit --memory 1024MB --process-type worker $TEST_APP"
|
||||||
|
echo "output: $output"
|
||||||
|
echo "status: $status"
|
||||||
|
assert_success
|
||||||
|
|
||||||
|
dokku ps:rebuild "$TEST_APP"
|
||||||
|
CID=$(< $DOKKU_ROOT/$TEST_APP/CONTAINER.web.1)
|
||||||
|
run /bin/bash -c "docker inspect --format '{{.HostConfig.Memory}}' $CID"
|
||||||
|
echo "output: $output"
|
||||||
|
echo "status: $status"
|
||||||
|
assert_output "536870912"
|
||||||
|
|
||||||
|
run /bin/bash -c "dokku resource:limit-clear --process-type worker $TEST_APP"
|
||||||
|
echo "output: $output"
|
||||||
|
echo "status: $status"
|
||||||
|
assert_success
|
||||||
|
|
||||||
|
dokku ps:rebuild "$TEST_APP"
|
||||||
|
CID=$(< $DOKKU_ROOT/$TEST_APP/CONTAINER.web.1)
|
||||||
|
run /bin/bash -c "docker inspect --format '{{.HostConfig.Memory}}' $CID"
|
||||||
|
echo "output: $output"
|
||||||
|
echo "status: $status"
|
||||||
|
assert_output "536870912"
|
||||||
|
|
||||||
|
run /bin/bash -c "dokku resource:limit-clear --process-type web $TEST_APP"
|
||||||
|
echo "output: $output"
|
||||||
|
echo "status: $status"
|
||||||
|
assert_success
|
||||||
|
|
||||||
|
dokku ps:rebuild "$TEST_APP"
|
||||||
|
CID=$(< $DOKKU_ROOT/$TEST_APP/CONTAINER.web.1)
|
||||||
|
run /bin/bash -c "docker inspect --format '{{.HostConfig.Memory}}' $CID"
|
||||||
|
echo "output: $output"
|
||||||
|
echo "status: $status"
|
||||||
|
assert_output "0"
|
||||||
|
}
|
||||||
|
|
||||||
|
@test "(docker-options) resource:reserve" {
|
||||||
|
run /bin/bash -c "dokku resource:reserve $TEST_APP"
|
||||||
|
echo "output: $output"
|
||||||
|
echo "status: $status"
|
||||||
|
assert_output_contains "resource reservation $TEST_APP information"
|
||||||
|
|
||||||
|
deploy_app
|
||||||
|
run /bin/bash -c "dokku resource:reserve --memory 512MB $TEST_APP"
|
||||||
|
echo "output: $output"
|
||||||
|
echo "status: $status"
|
||||||
|
assert_success
|
||||||
|
|
||||||
|
CID=$(< $DOKKU_ROOT/$TEST_APP/CONTAINER.web.1)
|
||||||
|
run /bin/bash -c "docker inspect --format '{{.HostConfig.MemoryReservation}}' $CID"
|
||||||
|
echo "output: $output"
|
||||||
|
echo "status: $status"
|
||||||
|
assert_output "0"
|
||||||
|
|
||||||
|
dokku ps:rebuild "$TEST_APP"
|
||||||
|
CID=$(< $DOKKU_ROOT/$TEST_APP/CONTAINER.web.1)
|
||||||
|
run /bin/bash -c "docker inspect --format '{{.HostConfig.MemoryReservation}}' $CID"
|
||||||
|
echo "output: $output"
|
||||||
|
echo "status: $status"
|
||||||
|
assert_output "536870912"
|
||||||
|
|
||||||
|
run /bin/bash -c "dokku resource:reserve --memory 1024MB --process-type worker $TEST_APP"
|
||||||
|
echo "output: $output"
|
||||||
|
echo "status: $status"
|
||||||
|
assert_success
|
||||||
|
|
||||||
|
dokku ps:rebuild "$TEST_APP"
|
||||||
|
CID=$(< $DOKKU_ROOT/$TEST_APP/CONTAINER.web.1)
|
||||||
|
run /bin/bash -c "docker inspect --format '{{.HostConfig.MemoryReservation}}' $CID"
|
||||||
|
echo "output: $output"
|
||||||
|
echo "status: $status"
|
||||||
|
assert_output "536870912"
|
||||||
|
|
||||||
|
run /bin/bash -c "dokku resource:reserve-clear --process-type worker $TEST_APP"
|
||||||
|
echo "output: $output"
|
||||||
|
echo "status: $status"
|
||||||
|
assert_success
|
||||||
|
|
||||||
|
dokku ps:rebuild "$TEST_APP"
|
||||||
|
CID=$(< $DOKKU_ROOT/$TEST_APP/CONTAINER.web.1)
|
||||||
|
run /bin/bash -c "docker inspect --format '{{.HostConfig.MemoryReservation}}' $CID"
|
||||||
|
echo "output: $output"
|
||||||
|
echo "status: $status"
|
||||||
|
assert_output "536870912"
|
||||||
|
|
||||||
|
run /bin/bash -c "dokku resource:reserve-clear --process-type web $TEST_APP"
|
||||||
|
echo "output: $output"
|
||||||
|
echo "status: $status"
|
||||||
|
assert_success
|
||||||
|
|
||||||
|
dokku ps:rebuild "$TEST_APP"
|
||||||
|
CID=$(< $DOKKU_ROOT/$TEST_APP/CONTAINER.web.1)
|
||||||
|
run /bin/bash -c "docker inspect --format '{{.HostConfig.MemoryReservation}}' $CID"
|
||||||
|
echo "output: $output"
|
||||||
|
echo "status: $status"
|
||||||
|
assert_output "0"
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user