1
0

Fix pushd

This commit is contained in:
nicolas.dorier
2019-06-12 12:49:22 +09:00
parent 5ad1d3c5b6
commit 4cfa4439e8
2 changed files with 4 additions and 4 deletions

View File

@@ -13,7 +13,7 @@ echo "Changing domain from \"$OLD_HOST\" to \"$NEW_HOST\""
export BTCPAY_HOST="$NEW_HOST" export BTCPAY_HOST="$NEW_HOST"
export ACME_CA_URI="https://acme-v01.api.letsencrypt.org/directory" export ACME_CA_URI="https://acme-v01.api.letsencrypt.org/directory"
pushd pushd .
# Modify environment file # Modify environment file
cd "$BTCPAY_BASE_DIRECTORY/btcpayserver-docker" cd "$BTCPAY_BASE_DIRECTORY/btcpayserver-docker"
. helpers.sh . helpers.sh

View File

@@ -85,7 +85,7 @@ WOOCOMMERCE_HOST=$WOOCOMMERCE_HOST" > $BTCPAY_ENV_FILE
} }
btcpay_up() { btcpay_up() {
pushd pushd .
cd "$(dirname "$BTCPAY_ENV_FILE")" cd "$(dirname "$BTCPAY_ENV_FILE")"
docker-compose -f $BTCPAY_DOCKER_COMPOSE up --remove-orphans -d -t "${COMPOSE_HTTP_TIMEOUT:-180}" docker-compose -f $BTCPAY_DOCKER_COMPOSE up --remove-orphans -d -t "${COMPOSE_HTTP_TIMEOUT:-180}"
# Depending on docker-compose, either the timeout does not work, or "compose -d and --timeout cannot be combined" # Depending on docker-compose, either the timeout does not work, or "compose -d and --timeout cannot be combined"
@@ -96,7 +96,7 @@ btcpay_up() {
} }
btcpay_down() { btcpay_down() {
pushd pushd .
cd "$(dirname "$BTCPAY_ENV_FILE")" cd "$(dirname "$BTCPAY_ENV_FILE")"
docker-compose -f $BTCPAY_DOCKER_COMPOSE down -t "${COMPOSE_HTTP_TIMEOUT:-180}" docker-compose -f $BTCPAY_DOCKER_COMPOSE down -t "${COMPOSE_HTTP_TIMEOUT:-180}"
# Depending on docker-compose, the timeout does not work. # Depending on docker-compose, the timeout does not work.
@@ -107,7 +107,7 @@ btcpay_down() {
} }
btcpay_restart() { btcpay_restart() {
pushd pushd .
cd "$(dirname "$BTCPAY_ENV_FILE")" cd "$(dirname "$BTCPAY_ENV_FILE")"
docker-compose -f $BTCPAY_DOCKER_COMPOSE restart -t "${COMPOSE_HTTP_TIMEOUT:-180}" docker-compose -f $BTCPAY_DOCKER_COMPOSE restart -t "${COMPOSE_HTTP_TIMEOUT:-180}"
# Depending on docker-compose, the timeout does not work. # Depending on docker-compose, the timeout does not work.