New Selfoss image & version

This commit is contained in:
3wc 2024-01-21 00:06:41 -03:00
parent ca393f063c
commit 724410ec71
3 changed files with 5 additions and 27 deletions

View File

@ -7,7 +7,7 @@
<!-- metadata --> <!-- metadata -->
* **Category**: Apps * **Category**: Apps
* **Status**: 1, alpha * **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 * **Healthcheck**: Yes
* **Backups**: No * **Backups**: No
* **Email**: No * **Email**: No

View File

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

View File

@ -1,4 +1,4 @@
#!/usr/bin/env bash #!/usr/bin/env sh
configure_php() { configure_php() {
# 3wc: these changes allow environment variables to propagate to PHP; Selfoss # 3wc: these changes allow environment variables to propagate to PHP; Selfoss
@ -16,31 +16,9 @@ configure_php() {
/etc/php7/php.ini /etc/php7/php.ini
fi 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() { load_vars() {
file_env "SELFOSS_PASSWORD" export SELFOSS_PASSWORD=$(cat $SELFOSS_PASSWORD_FILE)
file_env "SELFOSS_DB_PASSWORD" export SELFOSS_DB_PASSWORD=$(cat $SELFOSS_DB_PASSWORD_FILE)
} }
main() { main() {