refactor: move app.json script execution into it's own plugin
Rather than have this live in 00_dokku-standard, move it out so that it may start to support various other features around the app.json manifest.
This commit is contained in:
1 parent
1a36c77c46
commit
952db832d9
6 files changed
+52
-31
No files matched your search
File renamed without changes.
@@ -0,0 +1,4 @@
|
|||||||
|
[plugin]
|
||||||
|
description = "dokku core app-json plugin"
|
||||||
|
version = "0.13.4"
|
||||||
|
[plugin.config]
|
||||||
@@ -2,11 +2,11 @@
|
|||||||
set -eo pipefail
|
set -eo pipefail
|
||||||
[[ $DOKKU_TRACE ]] && set -x
|
[[ $DOKKU_TRACE ]] && set -x
|
||||||
source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
|
source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
|
||||||
source "$PLUGIN_CORE_AVAILABLE_PATH/00_dokku-standard/exec-app-json-scripts"
|
source "$PLUGIN_CORE_AVAILABLE_PATH/app-json/internal-functions"
|
||||||
|
|
||||||
exec_app_json_scripts() {
|
app_json_post_deploy() {
|
||||||
declare desc="core app.json scripts execution"
|
declare desc="app-json scripts execution"
|
||||||
local trigger="post-deploy app_json_scripts"
|
local trigger="app_json_post_deploy"
|
||||||
local APP="$1"
|
local APP="$1"
|
||||||
local IMAGE_TAG="$4"
|
local IMAGE_TAG="$4"
|
||||||
local PHASE_SCRIPT_KEY="postdeploy"
|
local PHASE_SCRIPT_KEY="postdeploy"
|
||||||
@@ -15,4 +15,4 @@ exec_app_json_scripts() {
|
|||||||
execute_script "$APP" "$IMAGE_TAG" "$PHASE_SCRIPT_KEY"
|
execute_script "$APP" "$IMAGE_TAG" "$PHASE_SCRIPT_KEY"
|
||||||
}
|
}
|
||||||
|
|
||||||
exec_app_json_scripts "$@"
|
app_json_post_deploy "$@"
|
||||||
@@ -2,11 +2,11 @@
|
|||||||
set -eo pipefail
|
set -eo pipefail
|
||||||
[[ $DOKKU_TRACE ]] && set -x
|
[[ $DOKKU_TRACE ]] && set -x
|
||||||
source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
|
source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
|
||||||
source "$PLUGIN_CORE_AVAILABLE_PATH/00_dokku-standard/exec-app-json-scripts"
|
source "$PLUGIN_CORE_AVAILABLE_PATH/app-json/internal-functions"
|
||||||
|
|
||||||
exec_app_json_scripts() {
|
app_json_pre_deploy() {
|
||||||
declare desc="core app.json scripts execution"
|
declare desc="app-json scripts execution"
|
||||||
local trigger="pre-deploy app_json_scripts"
|
local trigger="app_json_pre_deploy"
|
||||||
local APP="$1"
|
local APP="$1"
|
||||||
local IMAGE_TAG="$2"
|
local IMAGE_TAG="$2"
|
||||||
local PHASE_SCRIPT_KEY="predeploy"
|
local PHASE_SCRIPT_KEY="predeploy"
|
||||||
@@ -15,4 +15,4 @@ exec_app_json_scripts() {
|
|||||||
execute_script "$APP" "$IMAGE_TAG" "$PHASE_SCRIPT_KEY"
|
execute_script "$APP" "$IMAGE_TAG" "$PHASE_SCRIPT_KEY"
|
||||||
}
|
}
|
||||||
|
|
||||||
exec_app_json_scripts "$@"
|
app_json_pre_deploy "$@"
|
||||||
@@ -180,24 +180,3 @@ EOF
|
|||||||
echo "status: $status"
|
echo "status: $status"
|
||||||
assert_output "3001/udp 3000/tcp 3003"
|
assert_output "3001/udp 3000/tcp 3003"
|
||||||
}
|
}
|
||||||
|
|
||||||
@test "(core) app.json scripts" {
|
|
||||||
deploy_app
|
|
||||||
|
|
||||||
run /bin/bash -c "dokku run $TEST_APP ls /app/prebuild.test"
|
|
||||||
echo "output: $output"
|
|
||||||
echo "status: $status"
|
|
||||||
assert_failure
|
|
||||||
|
|
||||||
run /bin/bash -c "dokku run $TEST_APP ls /app/predeploy.test"
|
|
||||||
echo "output: $output"
|
|
||||||
echo "status: $status"
|
|
||||||
assert_success
|
|
||||||
|
|
||||||
CID=$(docker ps -a -q -f "ancestor=dokku/${TEST_APP}" -f "label=dokku_phase_script=postdeploy")
|
|
||||||
IMAGE_ID=$(docker commit $CID dokku-test/${TEST_APP})
|
|
||||||
run /bin/bash -c "docker run -ti $IMAGE_ID ls /app/postdeploy.test"
|
|
||||||
echo "output: $output"
|
|
||||||
echo "status: $status"
|
|
||||||
assert_success
|
|
||||||
}
|
|
||||||
@@ -0,0 +1,38 @@
|
|||||||
|
#!/usr/bin/env bats
|
||||||
|
|
||||||
|
load test_helper
|
||||||
|
|
||||||
|
setup() {
|
||||||
|
global_setup
|
||||||
|
create_app
|
||||||
|
DOCKERFILE="$BATS_TMPDIR/Dockerfile"
|
||||||
|
}
|
||||||
|
|
||||||
|
teardown() {
|
||||||
|
rm -rf /home/dokku/$TEST_APP/tls
|
||||||
|
destroy_app
|
||||||
|
dokku config:unset --global DOKKU_RM_CONTAINER
|
||||||
|
rm -f "$DOCKERFILE"
|
||||||
|
global_teardown
|
||||||
|
}
|
||||||
|
|
||||||
|
@test "(app-json) app.json scripts" {
|
||||||
|
deploy_app
|
||||||
|
|
||||||
|
run /bin/bash -c "dokku run $TEST_APP ls /app/prebuild.test"
|
||||||
|
echo "output: $output"
|
||||||
|
echo "status: $status"
|
||||||
|
assert_failure
|
||||||
|
|
||||||
|
run /bin/bash -c "dokku run $TEST_APP ls /app/predeploy.test"
|
||||||
|
echo "output: $output"
|
||||||
|
echo "status: $status"
|
||||||
|
assert_success
|
||||||
|
|
||||||
|
CID=$(docker ps -a -q -f "ancestor=dokku/${TEST_APP}" -f "label=dokku_phase_script=postdeploy")
|
||||||
|
IMAGE_ID=$(docker commit $CID dokku-test/${TEST_APP})
|
||||||
|
run /bin/bash -c "docker run -ti $IMAGE_ID ls /app/postdeploy.test"
|
||||||
|
echo "output: $output"
|
||||||
|
echo "status: $status"
|
||||||
|
assert_success
|
||||||
|
}
|
||||||
Reference in new issue
Block a user