Fix upgrade process; update Mastodon to 2.9.2

data/services/mastodon/containers.sh

@@ -18,7 +18,7 @@ mastodon_streaming_dockerbunker() {
 	docker run -d --user mastodon \
 		--name=${FUNCNAME[0]//_/-} \
 		--restart=always \
-		--health-cmd="wget -q --spider --header 'x-forwarded-proto: https' --proxy=off localhost:3000/api/v1/instance || exit 1" \
+		--health-cmd="wget -q --spider --header 'x-forwarded-proto: https' --proxy=off localhost:4000/api/v1/instance || exit 1" \
 		--health-interval=30s \
 		--network ${NETWORK} \
 		--network dockerbunker-${SERVICE_NAME} \

data/services/mastodon/mastodon.sh

@@ -16,7 +16,7 @@ declare -a containers=( "${SERVICE_NAME}-postgres-dockerbunker" "${SERVICE_NAME}
 declare -a add_to_network=( "${SERVICE_NAME}-service-dockerbunker" "${SERVICE_NAME}-streaming-dockerbunker" )
 declare -A volumes=( [${SERVICE_NAME}-data-vol-1]="/mastodon/public/system" [${SERVICE_NAME}-data-vol-2]="/mastodon/public/assets" [${SERVICE_NAME}-data-vol-3]="/mastodon/public/packs" [${SERVICE_NAME}-postgres-vol-1]="/var/lib/postgresql/data" [${SERVICE_NAME}-elasticsearch-vol-1]="/usr/share/elasticsearch/data" [${SERVICE_NAME}-redis-vol-1]="/data" )
 declare -a networks=( "dockerbunker-${SERVICE_NAME}" )
-declare -A IMAGES=( [service]="tootsuite/mastodon" [redis]="redis:5.0-alpine" [postgres]="postgres:9.6-alpine" [elasticsearch]="docker.elastic.co/elasticsearch/elasticsearch-oss:6.1.3" )
+declare -A IMAGES=( [service]="tootsuite/mastodon:v2.9.2" [redis]="redis:5.0-alpine" [postgres]="postgres:9.6-alpine" [elasticsearch]="docker.elastic.co/elasticsearch/elasticsearch-oss:6.1.3" )
 
 if [[ $1 == "make_admin" ]];then
 	if [[ -z $2 || $3 ]];then
@@ -51,6 +51,13 @@ upgrade() {
 
 	delete_old_images
 
+	start_containers
+
+	echo -en "\n  \e[3m\xe2\x86\x92 Execute \`tootctl cache clear\`\e[0m "
+	docker exec -t mastodon-service-dockerbunker sh -c 'tootctl cache clear'
+
+	sleep 5
+
 	restart_nginx
 }