diff --git a/defaults.sh b/defaults.sh index 087489c..ea68118 100755 --- a/defaults.sh +++ b/defaults.sh @@ -53,7 +53,7 @@ DEFAULT_DB_IMAGE="mariadb:10.9.3-jammy" # run the docker stack. -export GHOST_IMAGE="ghost:5.26.2" +export GHOST_IMAGE="ghost:5.37.0" # TODO switch to mysql. May require intricate export work for existing sites. # THIS MUST BE COMPLETED BEFORE v1 RELEASE @@ -61,10 +61,10 @@ export GHOST_IMAGE="ghost:5.26.2" export GHOST_DB_IMAGE="$DEFAULT_DB_IMAGE" -export NGINX_IMAGE="nginx:1.23.2" +export NGINX_IMAGE="nginx:1.23.3" # version of backup is 24.0.3 -export NEXTCLOUD_IMAGE="nextcloud:25.0.2" +export NEXTCLOUD_IMAGE="nextcloud:25.0.4" export NEXTCLOUD_DB_IMAGE="$DEFAULT_DB_IMAGE" # TODO PIN the gitea version number. diff --git a/deployment/btcpayserver/go.sh b/deployment/btcpayserver/go.sh index e027189..c8c3631 100755 --- a/deployment/btcpayserver/go.sh +++ b/deployment/btcpayserver/go.sh @@ -1,13 +1,10 @@ #!/bin/bash -set -eu +set -exu cd "$(dirname "$0")" export DOCKER_HOST="ssh://ubuntu@$BTCPAY_FQDN" -docker pull btcpayserver/lightning:v22.11.1 -docker build -t clightning:latest ./core-lightning - # run the btcpay setup script if it hasn't been done before. if [ "$(ssh "$BTCPAY_FQDN" [[ ! -f "$REMOTE_HOME/btcpay.complete" ]]; echo $?)" -eq 0 ]; then ./stub_btcpay_setup.sh diff --git a/deployment/btcpayserver/stub_btcpay_setup.sh b/deployment/btcpayserver/stub_btcpay_setup.sh index acf1105..06b08ac 100755 --- a/deployment/btcpayserver/stub_btcpay_setup.sh +++ b/deployment/btcpayserver/stub_btcpay_setup.sh @@ -20,8 +20,7 @@ export CLIGHTNING_WEBSOCKET_PORT="$CLIGHTNING_WEBSOCKET_PORT" # It also supports modern TLS, so SSL certs must be available. #opt-add-nostr-relay; -export BTCPAYSERVER_GITREPO="https://github.com/farscapian/btcpayserver-docker" -#https://github.com/btcpayserver/btcpayserver-docker +export BTCPAYSERVER_GITREPO="https://github.com/btcpayserver/btcpayserver-docker" cat > "$SITE_PATH/btcpay.sh" < "$CLAMS_CONFIG_PATH" <