Merge pull request #82 from fly-apps/exec-into-bash

Exec Bash just after sourcing stolon env
fly-apps · Oct 3, 2022 · 9864b5f · 9864b5f
2 parents aa228da + 9ef05f8
commit 9864b5f
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -56,7 +56,7 @@ RUN useradd -ms /bin/bash stolon
 RUN mkdir -p /run/haproxy/
 COPY --from=flyutil /fly/bin/* /usr/local/bin/
 
-ENV ENV="/fly/set-stolon-environment.sh"
+ENV ENV="/fly/shell-init"
 
 EXPOSE 5432
 

diff --git a/scripts/set-stolon-environment.sh b/scripts/set-stolon-environment.sh
diff --git a/scripts/shell-init b/scripts/shell-init
@@ -0,0 +1,11 @@
+#!/bin/dash
+# Dash sources this file according to POSIX envvar $ENV declared in Dockerfile
+# https://manpages.debian.org/stretch/dash/dash.1.en.html#Invocation
+
+if [ -f /data/.env ]; then
+  export $(cat /data/.env)
+fi
+
+# Upgrade to Bash shell
+unset ENV
+exec /bin/bash "$@"