New Selfoss image & version

README.md

@@ -7,7 +7,7 @@
 <!-- metadata -->
 * **Category**: Apps
 * **Status**: 1, alpha
-* **Image**: [`akito13/selfoss`](https://hub.docker.com/r/akito13/selfoss), 2, 3rd-party
+* **Image**: [`rsprta/selfoss`](https://hub.docker.com/r/rsprta/selfoss), 2, 3rd-party
 * **Healthcheck**: Yes
 * **Backups**: No
 * **Email**: No

compose.yml

@@ -1,7 +1,7 @@
 version: '3.8'
 services:
   app:
-    image: akito13/selfoss:0.2.0
+    image: rsprta/selfoss:2.19
     volumes:
       - selfoss:/selfoss/data
     environment:

entrypoint.sh.tmpl

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 
 configure_php() {
 	# 3wc: these changes allow environment variables to propagate to PHP; Selfoss
@@ -16,31 +16,9 @@ configure_php() {
 			/etc/php7/php.ini
 	fi
 }
-
-file_env() {
-	# 3wc: Load $VAR_FILE into $VAR - useful for secrets. See
-	# 	https://medium.com/@adrian.gheorghe.dev/using-docker-secrets-in-your-environment-variables-7a0609659aab
-	local var="$1"
-	local fileVar="${var}_FILE"
-	local def="${2:-}"
-
-	if [ "${!var:-}" ] && [ "${!fileVar:-}" ]; then
-		echo >&2 "error: both $var and $fileVar are set (but are exclusive)"
-		exit 1
-	fi
-	local val="$def"
-	if [ "${!var:-}" ]; then
-		val="${!var}"
-	elif [ "${!fileVar:-}" ]; then
-		val="$(< "${!fileVar}")"
-	fi
-	export "$var"="$val"
-	unset "$fileVar"
-}
-
 load_vars() {
-	file_env "SELFOSS_PASSWORD"
-	file_env "SELFOSS_DB_PASSWORD"
+	export SELFOSS_PASSWORD=$(cat $SELFOSS_PASSWORD_FILE)
+	export SELFOSS_DB_PASSWORD=$(cat $SELFOSS_DB_PASSWORD_FILE)
 }
 
 main() {