Merge branch 'nkupdates-edge' into 'edge'

Nkupdates edge

See merge request !85

Dockerfile

@@ -216,7 +216,7 @@ FROM registry.conarx.tech/containers/alpine/edge as mastodon-builder
 LABEL maintainer="Nigel Kukard <nkukard@lbsd.net>"
 ARG VERSION_INFO=
 
-ARG MASTODON_VER=4.3.0
+ARG MASTODON_VER=4.3.1
 
 
 # Copy in built binaries

usr/local/share/flexible-docker-containers/init.d/42-mastodon.sh

@@ -219,6 +219,10 @@ if [ "$MASTODON_MODE" = "web" ]; then
 		sleep 2
 	done
 
+	# Output keys if we don't have any
+	if [ -z "$ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY" ]; then
+		mastodon-rails db:encryption:init
+	fi
 
 	# Check if we need to initialize the database
 	if [ ! -f /opt/mastodon/private/VERSION ]; then
@@ -247,10 +251,6 @@ if [ "$MASTODON_MODE" = "web" ]; then
 		fi
 	fi
 
-	# Output keys if we don't have any
-	if [ -z "$ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY" ]; then
-		mastodon-rails db:encryption:init
-	fi
 else
 
 	while ! nc -z "$MASTODON_HOST" 3000; do