fix: ensure we write the ipaddr and port
This commit is contained in:
committed by
Michael Hobbs
parent
f668bec210
commit
a9e0f8b7be
@@ -632,8 +632,8 @@ dokku_deploy_cmd() {
|
|||||||
|
|
||||||
# now using the new container
|
# now using the new container
|
||||||
[[ -n "$id" ]] && echo "$id" > "$DOKKU_CONTAINER_ID_FILE"
|
[[ -n "$id" ]] && echo "$id" > "$DOKKU_CONTAINER_ID_FILE"
|
||||||
[[ -n "$ipaddr" ]] && network-write-container-ipaddr "$APP" "$PROC_TYPE" "$CONTAINER_INDEX" "$ipaddr"
|
[[ -n "$ipaddr" ]] && plugn trigger network-write-ipaddr "$APP" "$PROC_TYPE" "$CONTAINER_INDEX" "$ipaddr"
|
||||||
[[ -n "$port" ]] && network-write-container-port "$APP" "$PROC_TYPE" "$CONTAINER_INDEX" "$port"
|
[[ -n "$port" ]] && plugn trigger network-write-port "$APP" "$PROC_TYPE" "$CONTAINER_INDEX" "$port"
|
||||||
|
|
||||||
# cleanup pre-migration files
|
# cleanup pre-migration files
|
||||||
rm -f "$DOKKU_ROOT/$APP/CONTAINER" "$DOKKU_ROOT/$APP/IP" "$DOKKU_ROOT/$APP/PORT"
|
rm -f "$DOKKU_ROOT/$APP/CONTAINER" "$DOKKU_ROOT/$APP/IP" "$DOKKU_ROOT/$APP/PORT"
|
||||||
|
|||||||
11
plugins/network/network-write-ipaddr
Executable file
11
plugins/network/network-write-ipaddr
Executable file
@@ -0,0 +1,11 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
|
||||||
|
|
||||||
|
network-write-ipaddr() {
|
||||||
|
declare desc="Writes the ipaddr to disk"
|
||||||
|
declare APP="$1" PROC_TYPE="$2" CONTAINER_INDEX="$3" IP_ADDRESS="$4"
|
||||||
|
local DOKKU_IP_FILE="$DOKKU_ROOT/$APP/IP.$PROC_TYPE.$CONTAINER_INDEX"
|
||||||
|
echo "$IP_ADDRESS" > "$DOKKU_IP_FILE"
|
||||||
|
}
|
||||||
|
|
||||||
|
network-write-ipaddr "$@"
|
||||||
11
plugins/network/network-write-port
Executable file
11
plugins/network/network-write-port
Executable file
@@ -0,0 +1,11 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
|
||||||
|
|
||||||
|
network-write-port() {
|
||||||
|
declare desc="Writes the ipaddr to disk"
|
||||||
|
declare APP="$1" PROC_TYPE="$2" CONTAINER_INDEX="$3" PORT="$4"
|
||||||
|
local DOKKU_PORT_FILE="$DOKKU_ROOT/$APP/PORT.$PROC_TYPE.$CONTAINER_INDEX"
|
||||||
|
echo "$PORT" > "$DOKKU_PORT_FILE"
|
||||||
|
}
|
||||||
|
|
||||||
|
network-write-port "$@"
|
||||||
Reference in New Issue
Block a user