From 435aa16638f54b764be7e1e96a94cf11ad2bd949 Mon Sep 17 00:00:00 2001
From: decentral1se <cellarspoon@riseup.net>
Date: Wed, 15 Feb 2023 20:16:01 +0100
Subject: [PATCH] fix: migrate latest hometown changes [ci skip]

---
 abra.sh            |  2 +-
 compose.yml        |  1 -
 entrypoint.sh.tmpl | 29 ++---------------------------
 3 files changed, 3 insertions(+), 29 deletions(-)

diff --git a/abra.sh b/abra.sh
index aecf983..1660ec8 100644
--- a/abra.sh
+++ b/abra.sh
@@ -1,4 +1,4 @@
-export ENTRYPOINT_CONF_VERSION=v1
+export ENTRYPOINT_CONF_VERSION=v2
 
 admin() {
   export OTP_SECRET=$(cat /run/secrets/otp_secret)
diff --git a/compose.yml b/compose.yml
index f5d32b2..95a8bc6 100644
--- a/compose.yml
+++ b/compose.yml
@@ -44,7 +44,6 @@ services:
       - CACHE_REDIS_URL
       - DB_HOST
       - DB_NAME
-      - DB_PASS_FILE=/run/secrets/db_password
       - DB_PORT
       - DB_USER
       - DEFAULT_LOCALE
diff --git a/entrypoint.sh.tmpl b/entrypoint.sh.tmpl
index b9cc5c1..01abc08 100644
--- a/entrypoint.sh.tmpl
+++ b/entrypoint.sh.tmpl
@@ -2,31 +2,6 @@
 
 set -eu
 
-file_env() {
-  local var="$1"
-  local fileVar="${var}_FILE"
-  local def="${2:-}"
+export DB_PASS=$(cat /run/secrets/db_password)
 
-  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"
-}
-
-file_env "DB_PASS"
-file_env "OTP_SECRET"
-file_env "SECRET_KEY_BASE"
-file_env "SMTP_PASSWORD"
-file_env "VAPID_PRIVATE_KEY"
-
-/usr/bin/tini -- "$@"
+/usr/bin/tini -s -- "$@"