From 6bfb2ac153fbb7600c039850007f5b6374d4a186 Mon Sep 17 00:00:00 2001
From: cellarspoon <cellarspoon@riseup.net>
Date: Thu, 6 Jan 2022 12:32:58 +0100
Subject: [PATCH] fix: use sh, only thing available

---
 compose.yml        |  1 -
 entrypoint.sh.tmpl | 38 ++++++++------------------------------
 2 files changed, 8 insertions(+), 31 deletions(-)

diff --git a/compose.yml b/compose.yml
index 627a22f..e4d4f83 100644
--- a/compose.yml
+++ b/compose.yml
@@ -44,7 +44,6 @@ services:
       - TEAM_LOGO
       - URL=https://$DOMAIN
       - UTILS_SECRET_FILE=/run/secrets/utils_secret
-    command: yarn start
     entrypoint: /docker-entrypoint.sh
     deploy:
       labels:
diff --git a/entrypoint.sh.tmpl b/entrypoint.sh.tmpl
index 88c2bf8..041419d 100644
--- a/entrypoint.sh.tmpl
+++ b/entrypoint.sh.tmpl
@@ -1,32 +1,10 @@
-#!/bin/bash
-
-set -e
-
-file_env() {
-   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"
-}
-
-file_env "AWS_SECRET_KEY"
-file_env "OIDC_CLIENT_SECRET"
-file_env "UTILS_SECRET"
-file_env "DATABASE_PASSWORD"
+#!/bin/sh
 
+export AWS_SECRET_KEY=$(cat /run/secrets/aws_secret_key)
+export OIDC_CLIENT_SECRET=$(cat /run/secrets/oidc_client_secret)
+export UTILS_SECRET=$(cat /run/secrets/utils_secret)
+export SECRET_KEY=$(cat /run/secrets/secret_key)
+export DATABASE_PASSWORD=$(cat /run/secrets/db_password)
 export DATABASE_URL="postgres://outline:${DATABASE_PASSWORD}@${STACK_NAME}_postgres:5432/outline"
+
+/usr/local/bin/yarn start "$@"