From f1080771d057679211707c2c6ac4501850d4b52b Mon Sep 17 00:00:00 2001
From: Robert Kaussow <mail@geeklabor.de>
Date: Mon, 3 Feb 2020 23:46:16 +0100
Subject: [PATCH] use absolute path

---
 docker-compose.yml               | 2 --
 overlay/usr/local/bin/entrypoint | 6 +++---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index fc4f5e3..27dcb64 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -20,8 +20,6 @@ services:
     volumes:
       - data:/app/data
     environment:
-      BITWARDENRS_WAIT_FOR_HOST: bitwardenrs_postgres
-      BITWARDENRS_WAIT_FOR_PORT: 5432
       BITWARDENRS_DATABASE_URL: postgresql://user:pass@bitwardenrs_postgres:5432/bitwarden
       BITWARDENRS_ADMIN_TOKEN: test
 
diff --git a/overlay/usr/local/bin/entrypoint b/overlay/usr/local/bin/entrypoint
index d4ee839..8c39df1 100755
--- a/overlay/usr/local/bin/entrypoint
+++ b/overlay/usr/local/bin/entrypoint
@@ -4,10 +4,10 @@ set -eo
 
 /usr/local/bin/gomplate -V -o /app/.env -f /etc/templates/env.tmpl
 
-if [ "$BITWARDENRS_WAITFOR_ENABLED" = true ]
+if [ -n "$BITWARDENRS_DATABASE_URL" ]
 then
-  WAITFOR_HOST=$(url-parse host --url "$BITWARDENRS_DATABASE_URL")
-  WAITFOR_PORT=$(url-parse port --url "$BITWARDENRS_DATABASE_URL")
+  WAITFOR_HOST=$(/usr/local/bin/url-parse host --url "$BITWARDENRS_DATABASE_URL")
+  WAITFOR_PORT=$(/usr/local/bin/url-parse port --url "$BITWARDENRS_DATABASE_URL")
 
   printf "Wait for database server ...\n"
   /usr/local/bin/wait-for "${WAITFOR_HOST}":"${WAITFOR_PORT:-5432}"