feat: call clone/destroy prop commands as necessary
This commit is contained in:
1 parent
d336d7c5c2
commit
63f4ec3867
18 files changed
+134
-13
No files matched your search
@@ -3,6 +3,5 @@
|
|||||||
/triggers/*
|
/triggers/*
|
||||||
/triggers
|
/triggers
|
||||||
/install
|
/install
|
||||||
/post-delete
|
/post-*
|
||||||
/post-extract
|
|
||||||
/report
|
/report
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
SUBCOMMANDS = subcommands/add subcommands/clear subcommands/list subcommands/remove subcommands/report subcommands/set
|
SUBCOMMANDS = subcommands/add subcommands/clear subcommands/list subcommands/remove subcommands/report subcommands/set
|
||||||
TRIGGERS = triggers/install triggers/post-delete triggers/post-extract triggers/report
|
TRIGGERS = triggers/install triggers/post-app-clone-setup triggers/post-app-rename-setup triggers/post-delete triggers/post-extract triggers/report
|
||||||
BUILD = commands subcommands triggers
|
BUILD = commands subcommands triggers
|
||||||
PLUGIN_NAME = buildpacks
|
PLUGIN_NAME = buildpacks
|
||||||
|
|
||||||
|
|||||||
@@ -19,6 +19,14 @@ func main() {
|
|||||||
switch trigger {
|
switch trigger {
|
||||||
case "install":
|
case "install":
|
||||||
buildpacks.TriggerInstall()
|
buildpacks.TriggerInstall()
|
||||||
|
case "post-app-clone-setup":
|
||||||
|
oldAppName := flag.Arg(0)
|
||||||
|
newAppName := flag.Arg(1)
|
||||||
|
buildpacks.TriggerPostAppCloneSetup(oldAppName, newAppName)
|
||||||
|
case "post-app-rename-setup":
|
||||||
|
oldAppName := flag.Arg(0)
|
||||||
|
newAppName := flag.Arg(1)
|
||||||
|
buildpacks.TriggerPostAppRenameSetup(oldAppName, newAppName)
|
||||||
case "post-delete":
|
case "post-delete":
|
||||||
appName := flag.Arg(0)
|
appName := flag.Arg(0)
|
||||||
buildpacks.TriggerPostDelete(appName)
|
buildpacks.TriggerPostDelete(appName)
|
||||||
|
|||||||
@@ -16,6 +16,29 @@ func TriggerInstall() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// TriggerPostAppCloneSetup creates new buildpacks files
|
||||||
|
func TriggerPostAppCloneSetup(oldAppName string, newAppName string) error {
|
||||||
|
err := common.PropertyClone("buildpacks", oldAppName, newAppName)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// TriggerPostAppRenameSetup renames buildpacks files
|
||||||
|
func TriggerPostAppRenameSetup(oldAppName string, newAppName string) error {
|
||||||
|
if err := common.PropertyClone("buildpacks", oldAppName, newAppName); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := common.PropertyDestroy("buildpacks", oldAppName); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
// TriggerPostDelete destroys the buildpacks property for a given app container
|
// TriggerPostDelete destroys the buildpacks property for a given app container
|
||||||
func TriggerPostDelete(appName string) {
|
func TriggerPostDelete(appName string) {
|
||||||
err := common.PropertyDestroy("buildpacks", appName)
|
err := common.PropertyDestroy("buildpacks", appName)
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
set -eo pipefail
|
set -eo pipefail
|
||||||
[[ $DOKKU_TRACE ]] && set -x
|
[[ $DOKKU_TRACE ]] && set -x
|
||||||
|
source "$PLUGIN_CORE_AVAILABLE_PATH/common/property-functions"
|
||||||
|
|
||||||
trigger-git-post-app-clone-setup() {
|
trigger-git-post-app-clone-setup() {
|
||||||
declare desc="modifies git-hook"
|
declare desc="modifies git-hook"
|
||||||
@@ -10,6 +11,8 @@ trigger-git-post-app-clone-setup() {
|
|||||||
if [[ -f "$DOKKU_ROOT/$NEW_APP/hooks/pre-receive" ]]; then
|
if [[ -f "$DOKKU_ROOT/$NEW_APP/hooks/pre-receive" ]]; then
|
||||||
sed -i -e "s/git-hook $OLD_APP/git-hook $NEW_APP/g" "$DOKKU_ROOT/$NEW_APP/hooks/pre-receive"
|
sed -i -e "s/git-hook $OLD_APP/git-hook $NEW_APP/g" "$DOKKU_ROOT/$NEW_APP/hooks/pre-receive"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
fn-plugin-property-clone "git" "$OLD_APP" "$NEW_APP"
|
||||||
}
|
}
|
||||||
|
|
||||||
trigger-git-post-app-clone-setup "$@"
|
trigger-git-post-app-clone-setup "$@"
|
||||||
@@ -1,6 +1,7 @@
|
|||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
set -eo pipefail
|
set -eo pipefail
|
||||||
[[ $DOKKU_TRACE ]] && set -x
|
[[ $DOKKU_TRACE ]] && set -x
|
||||||
|
source "$PLUGIN_CORE_AVAILABLE_PATH/common/property-functions"
|
||||||
|
|
||||||
trigger-git-post-app-rename-setup() {
|
trigger-git-post-app-rename-setup() {
|
||||||
declare desc="modifies git-hook"
|
declare desc="modifies git-hook"
|
||||||
@@ -10,6 +11,9 @@ trigger-git-post-app-rename-setup() {
|
|||||||
if [[ -f "$DOKKU_ROOT/$NEW_APP/hooks/pre-receive" ]]; then
|
if [[ -f "$DOKKU_ROOT/$NEW_APP/hooks/pre-receive" ]]; then
|
||||||
sed -i -e "s/git-hook $OLD_APP/git-hook $NEW_APP/g" "$DOKKU_ROOT/$NEW_APP/hooks/pre-receive"
|
sed -i -e "s/git-hook $OLD_APP/git-hook $NEW_APP/g" "$DOKKU_ROOT/$NEW_APP/hooks/pre-receive"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
fn-plugin-property-clone "git" "$OLD_APP" "$NEW_APP"
|
||||||
|
fn-plugin-property-destroy "git" "$OLD_APP"
|
||||||
}
|
}
|
||||||
|
|
||||||
trigger-git-post-app-rename-setup "$@"
|
trigger-git-post-app-rename-setup "$@"
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
SUBCOMMANDS = subcommands/create subcommands/destroy subcommands/exists subcommands/info subcommands/list subcommands/rebuild subcommands/rebuildall subcommands/report subcommands/set
|
SUBCOMMANDS = subcommands/create subcommands/destroy subcommands/exists subcommands/info subcommands/list subcommands/rebuild subcommands/rebuildall subcommands/report subcommands/set
|
||||||
TRIGGERS = triggers/core-post-deploy triggers/install triggers/network-build-config triggers/network-compute-ports triggers/network-config-exists triggers/network-get-ipaddr triggers/network-get-listeners triggers/network-get-port triggers/network-get-property triggers/network-write-ipaddr triggers/network-write-port triggers/post-app-clone-setup triggers/post-container-create triggers/post-create triggers/post-delete triggers/report
|
TRIGGERS = triggers/core-post-deploy triggers/install triggers/network-build-config triggers/network-compute-ports triggers/network-config-exists triggers/network-get-ipaddr triggers/network-get-listeners triggers/network-get-port triggers/network-get-property triggers/network-write-ipaddr triggers/network-write-port triggers/post-app-clone-setup triggers/post-app-rename-setup triggers/post-container-create triggers/post-create triggers/post-delete triggers/report
|
||||||
BUILD = commands subcommands triggers
|
BUILD = commands subcommands triggers
|
||||||
PLUGIN_NAME = network
|
PLUGIN_NAME = network
|
||||||
|
|
||||||
|
|||||||
@@ -188,8 +188,8 @@ func HasNetworkConfig(appName string) bool {
|
|||||||
return common.FileExists(ipfile) && common.FileExists(portfile)
|
return common.FileExists(ipfile) && common.FileExists(portfile)
|
||||||
}
|
}
|
||||||
|
|
||||||
// PostAppCloneSetup removes old IP and PORT files for a newly cloned app
|
// ClearNetworkConfig removes old IP and PORT files for a newly cloned app
|
||||||
func PostAppCloneSetup(appName string) bool {
|
func ClearNetworkConfig(appName string) bool {
|
||||||
dokkuRoot := common.MustGetEnv("DOKKU_ROOT")
|
dokkuRoot := common.MustGetEnv("DOKKU_ROOT")
|
||||||
appRoot := strings.Join([]string{dokkuRoot, appName}, "/")
|
appRoot := strings.Join([]string{dokkuRoot, appName}, "/")
|
||||||
success := true
|
success := true
|
||||||
|
|||||||
@@ -61,8 +61,13 @@ func main() {
|
|||||||
port := flag.Arg(3)
|
port := flag.Arg(3)
|
||||||
network.TriggerNetworkWritePort(appName, processType, containerIndex, port)
|
network.TriggerNetworkWritePort(appName, processType, containerIndex, port)
|
||||||
case "post-app-clone-setup":
|
case "post-app-clone-setup":
|
||||||
appName := flag.Arg(1)
|
oldAppName := flag.Arg(0)
|
||||||
network.TriggerPostAppCloneSetup(appName)
|
newAppName := flag.Arg(1)
|
||||||
|
network.TriggerPostAppCloneSetup(oldAppName, newAppName)
|
||||||
|
case "post-app-rename-setup":
|
||||||
|
oldAppName := flag.Arg(0)
|
||||||
|
newAppName := flag.Arg(1)
|
||||||
|
network.TriggerPostAppRenameSetup(oldAppName, newAppName)
|
||||||
case "post-container-create":
|
case "post-container-create":
|
||||||
containerType := flag.Arg(0)
|
containerType := flag.Arg(0)
|
||||||
containerID := flag.Arg(1)
|
containerID := flag.Arg(1)
|
||||||
|
|||||||
@@ -153,12 +153,37 @@ func TriggerNetworkWritePort(appName string, processType string, containerIndex
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// TriggerPostAppCloneSetup cleans up network files for a new app clone
|
// TriggerPostAppCloneSetup creates new network files
|
||||||
func TriggerPostAppCloneSetup(appName string) {
|
func TriggerPostAppCloneSetup(oldAppName string, newAppName string) error {
|
||||||
success := PostAppCloneSetup(appName)
|
success := ClearNetworkConfig(newAppName)
|
||||||
if !success {
|
if !success {
|
||||||
os.Exit(1)
|
os.Exit(1)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
err := common.PropertyClone("network", oldAppName, newAppName)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// TriggerPostAppRenameSetup renames network files
|
||||||
|
func TriggerPostAppRenameSetup(oldAppName string, newAppName string) error {
|
||||||
|
success := ClearNetworkConfig(newAppName)
|
||||||
|
if !success {
|
||||||
|
os.Exit(1)
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := common.PropertyClone("network", oldAppName, newAppName); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := common.PropertyDestroy("network", oldAppName); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// TriggerPostContainerCreate associates the container with a specified network
|
// TriggerPostContainerCreate associates the container with a specified network
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
set -eo pipefail
|
set -eo pipefail
|
||||||
[[ $DOKKU_TRACE ]] && set -x
|
[[ $DOKKU_TRACE ]] && set -x
|
||||||
|
source "$PLUGIN_CORE_AVAILABLE_PATH/common/property-functions"
|
||||||
|
|
||||||
trigger-nginx-vhosts-post-app-clone-setup() {
|
trigger-nginx-vhosts-post-app-clone-setup() {
|
||||||
declare desc="removes nginx files when setting up a clone"
|
declare desc="removes nginx files when setting up a clone"
|
||||||
@@ -8,6 +9,7 @@ trigger-nginx-vhosts-post-app-clone-setup() {
|
|||||||
declare OLD_APP="$1" NEW_APP="$2"
|
declare OLD_APP="$1" NEW_APP="$2"
|
||||||
local APP_DIR="$DOKKU_ROOT/$NEW_APP"
|
local APP_DIR="$DOKKU_ROOT/$NEW_APP"
|
||||||
|
|
||||||
|
fn-plugin-property-clone "nginx" "$OLD_APP" "$NEW_APP"
|
||||||
rm -rf "$APP_DIR/nginx.conf"
|
rm -rf "$APP_DIR/nginx.conf"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -2,6 +2,7 @@
|
|||||||
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/common/property-functions"
|
||||||
source "$PLUGIN_AVAILABLE_PATH/nginx-vhosts/internal-functions"
|
source "$PLUGIN_AVAILABLE_PATH/nginx-vhosts/internal-functions"
|
||||||
source "$PLUGIN_AVAILABLE_PATH/proxy/functions"
|
source "$PLUGIN_AVAILABLE_PATH/proxy/functions"
|
||||||
|
|
||||||
@@ -10,6 +11,8 @@ trigger-nginx-vhosts-post-app-rename-setup() {
|
|||||||
declare trigger="post-app-rename-setup"
|
declare trigger="post-app-rename-setup"
|
||||||
declare OLD_APP="$1" NEW_APP="$2"
|
declare OLD_APP="$1" NEW_APP="$2"
|
||||||
|
|
||||||
|
fn-plugin-property-clone "nginx" "$OLD_APP" "$NEW_APP"
|
||||||
|
fn-plugin-property-destroy "nginx" "$OLD_APP"
|
||||||
plugn trigger proxy-clear-config "$NEW_APP"
|
plugn trigger proxy-clear-config "$NEW_APP"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
/triggers/*
|
/triggers/*
|
||||||
/triggers
|
/triggers
|
||||||
/install
|
/install
|
||||||
/post-delete
|
/post-*
|
||||||
/report
|
/report
|
||||||
/docker-args-process-deploy
|
/docker-args-process-deploy
|
||||||
/docker-args-process-run
|
/docker-args-process-run
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
SUBCOMMANDS = subcommands/limit subcommands/limit-clear subcommands/report subcommands/reserve subcommands/reserve-clear
|
SUBCOMMANDS = subcommands/limit subcommands/limit-clear subcommands/report subcommands/reserve subcommands/reserve-clear
|
||||||
TRIGGERS = triggers/docker-args-process-deploy triggers/install triggers/post-delete triggers/report triggers/resource-get-property
|
TRIGGERS = triggers/docker-args-process-deploy triggers/install triggers/post-app-clone-setup triggers/post-app-rename-setup triggers/post-delete triggers/report triggers/resource-get-property
|
||||||
BUILD = commands subcommands triggers
|
BUILD = commands subcommands triggers
|
||||||
PLUGIN_NAME = resource
|
PLUGIN_NAME = resource
|
||||||
|
|
||||||
|
|||||||
@@ -24,6 +24,14 @@ func main() {
|
|||||||
err = resource.TriggerDockerArgsProcessDeploy(appName, processType)
|
err = resource.TriggerDockerArgsProcessDeploy(appName, processType)
|
||||||
case "install":
|
case "install":
|
||||||
err = resource.TriggerInstall()
|
err = resource.TriggerInstall()
|
||||||
|
case "post-app-clone-setup":
|
||||||
|
oldAppName := flag.Arg(0)
|
||||||
|
newAppName := flag.Arg(1)
|
||||||
|
err := resource.TriggerPostAppCloneSetup(oldAppName, newAppName)
|
||||||
|
case "post-app-rename-setup":
|
||||||
|
oldAppName := flag.Arg(0)
|
||||||
|
newAppName := flag.Arg(1)
|
||||||
|
err := resource.TriggerPostAppRenameSetup(oldAppName, newAppName)
|
||||||
case "post-delete":
|
case "post-delete":
|
||||||
appName := flag.Arg(0)
|
appName := flag.Arg(0)
|
||||||
err = resource.TriggerPostDelete(appName)
|
err = resource.TriggerPostDelete(appName)
|
||||||
|
|||||||
@@ -92,6 +92,29 @@ func TriggerInstall() error {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// TriggerPostAppCloneSetup creates new resource files
|
||||||
|
func TriggerPostAppCloneSetup(oldAppName string, newAppName string) error {
|
||||||
|
err := common.PropertyClone("resource", oldAppName, newAppName)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// TriggerPostAppRenameSetup renames resource files
|
||||||
|
func TriggerPostAppRenameSetup(oldAppName string, newAppName string) error {
|
||||||
|
if err := common.PropertyClone("resource", oldAppName, newAppName); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := common.PropertyDestroy("resource", oldAppName); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
// TriggerPostDelete destroys the resource property for a given app container
|
// TriggerPostDelete destroys the resource property for a given app container
|
||||||
func TriggerPostDelete(appName string) error {
|
func TriggerPostDelete(appName string) error {
|
||||||
return common.PropertyDestroy("resource", appName)
|
return common.PropertyDestroy("resource", appName)
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
set -eo pipefail
|
set -eo pipefail
|
||||||
[[ $DOKKU_TRACE ]] && set -x
|
[[ $DOKKU_TRACE ]] && set -x
|
||||||
|
source "$PLUGIN_CORE_AVAILABLE_PATH/common/property-functions"
|
||||||
|
|
||||||
trigger-scheduler-docker-local-post-app-clone-setup() {
|
trigger-scheduler-docker-local-post-app-clone-setup() {
|
||||||
declare desc="removes docker-local files when setting up a clone"
|
declare desc="removes docker-local files when setting up a clone"
|
||||||
@@ -8,6 +9,7 @@ trigger-scheduler-docker-local-post-app-clone-setup() {
|
|||||||
declare OLD_APP="$1" NEW_APP="$2"
|
declare OLD_APP="$1" NEW_APP="$2"
|
||||||
local APP_DIR="$DOKKU_ROOT/$NEW_APP"
|
local APP_DIR="$DOKKU_ROOT/$NEW_APP"
|
||||||
|
|
||||||
|
fn-plugin-property-clone "scheduler-docker-local" "$OLD_APP" "$NEW_APP"
|
||||||
find "$APP_DIR" -type f -name 'CONTAINER.*' -exec rm {} \;
|
find "$APP_DIR" -type f -name 'CONTAINER.*' -exec rm {} \;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+16
@@ -0,0 +1,16 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
set -eo pipefail
|
||||||
|
[[ $DOKKU_TRACE ]] && set -x
|
||||||
|
source "$PLUGIN_CORE_AVAILABLE_PATH/common/property-functions"
|
||||||
|
|
||||||
|
trigger-scheduler-docker-local-post-app-rename-setup() {
|
||||||
|
declare desc="updates settings when renaming an app"
|
||||||
|
declare trigger="post-app-rename-setup"
|
||||||
|
declare OLD_APP="$1" NEW_APP="$2"
|
||||||
|
local APP_DIR="$DOKKU_ROOT/$NEW_APP"
|
||||||
|
|
||||||
|
fn-plugin-property-clone "scheduler-docker-local" "$OLD_APP" "$NEW_APP"
|
||||||
|
fn-plugin-property-destroy "scheduler-docker-local" "$OLD_APP"
|
||||||
|
}
|
||||||
|
|
||||||
|
trigger-scheduler-docker-local-post-app-rename-setup "$@"
|
||||||
Reference in new issue
Block a user