Skip to content
This repository was archived by the owner on Mar 4, 2025. It is now read-only.

Commit 5df77a2

Browse files
committed
Added support for .env file in local source directory
The .env file is simply "sourced" from inside the container, prior to launching the compiled DBHub.io daemons. This allows for setting environment variable overrides (eg SMTP2GO_API_KEY), without them being captured into git. Example: export SMTP2GO_API_KEY=your_test_key_here
1 parent 210e751 commit 5df77a2

File tree

2 files changed

+12
-9
lines changed

2 files changed

+12
-9
lines changed

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,3 +53,6 @@ webui/js/dbhub.js*
5353
webui/js/auth.js
5454
webui/js/db-header.js
5555
webui/js/markdown-editor.js
56+
57+
# Local secrets
58+
.env

docker/Dockerfile

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -96,9 +96,9 @@ RUN GOBIN=/usr/local/bin go install github.com/go-delve/delve/cmd/dlv@latest
9696
# Add script pieces for starting DBHub.io services
9797
# Note that we only background the webui and api daemons. The db4s daemon is left running, to prevent start.sh from exiting
9898
RUN echo "echo 127.0.0.1 docker-dev.dbhub.io docker-dev >> /etc/hosts" >> /usr/local/bin/start.sh && \
99-
echo "su - dbhub -c 'CONFIG_FILE=${CONFIG_FILE} /usr/local/bin/dbhub-webui >>/home/dbhub/output.log 2>&1 &'" >> /usr/local/bin/start.sh && \
100-
echo "su - dbhub -c 'CONFIG_FILE=${CONFIG_FILE} /usr/local/bin/dbhub-api >>/home/dbhub/output.log 2>&1 &'" >> /usr/local/bin/start.sh && \
101-
echo "su - dbhub -c 'CONFIG_FILE=${CONFIG_FILE} /usr/local/bin/dbhub-db4s >>/home/dbhub/output.log 2>&1 &'" >> /usr/local/bin/start.sh && \
99+
echo "su - dbhub -c 'if [ -f "${DBHUB_SOURCE}/.env" ]; then source ${DBHUB_SOURCE}/.env; fi; CONFIG_FILE=${CONFIG_FILE} /usr/local/bin/dbhub-webui >>/home/dbhub/output.log 2>&1 &'" >> /usr/local/bin/start.sh && \
100+
echo "su - dbhub -c 'if [ -f "${DBHUB_SOURCE}/.env" ]; then source ${DBHUB_SOURCE}/.env; fi; CONFIG_FILE=${CONFIG_FILE} /usr/local/bin/dbhub-api >>/home/dbhub/output.log 2>&1 &'" >> /usr/local/bin/start.sh && \
101+
echo "su - dbhub -c 'if [ -f "${DBHUB_SOURCE}/.env" ]; then source ${DBHUB_SOURCE}/.env; fi; CONFIG_FILE=${CONFIG_FILE} /usr/local/bin/dbhub-db4s >>/home/dbhub/output.log 2>&1 &'" >> /usr/local/bin/start.sh && \
102102
echo "while :; do" >> /usr/local/bin/start.sh && \
103103
echo " sleep 5" >> /usr/local/bin/start.sh && \
104104
echo "done" >> /usr/local/bin/start.sh
@@ -129,9 +129,9 @@ RUN echo "# Kill the existing running daemons" >> /usr/local/bin/restart.sh && \
129129
echo "if [ -c /dev/console ]; then" >> /usr/local/bin/restart.sh && \
130130
echo " chmod o+w /dev/console" >> /usr/local/bin/restart.sh && \
131131
echo "fi" >> /usr/local/bin/restart.sh && \
132-
echo "su - dbhub -c 'CONFIG_FILE=/dbhub.io/docker/config.toml nohup /usr/local/bin/dbhub-webui >>/home/dbhub/output.log 2>&1 &'" >> /usr/local/bin/restart.sh && \
133-
echo "su - dbhub -c 'CONFIG_FILE=/dbhub.io/docker/config.toml nohup /usr/local/bin/dbhub-api >>/home/dbhub/output.log 2>&1 &'" >> /usr/local/bin/restart.sh && \
134-
echo "su - dbhub -c 'CONFIG_FILE=/dbhub.io/docker/config.toml nohup /usr/local/bin/dbhub-db4s >>/home/dbhub/output.log 2>&1 &'" >> /usr/local/bin/restart.sh && \
132+
echo "su - dbhub -c 'if [ -f "${DBHUB_SOURCE}/.env" ]; then source ${DBHUB_SOURCE}/.env; fi; CONFIG_FILE=${CONFIG_FILE} nohup /usr/local/bin/dbhub-webui >>/home/dbhub/output.log 2>&1 &'" >> /usr/local/bin/restart.sh && \
133+
echo "su - dbhub -c 'if [ -f "${DBHUB_SOURCE}/.env" ]; then source ${DBHUB_SOURCE}/.env; fi; CONFIG_FILE=${CONFIG_FILE} nohup /usr/local/bin/dbhub-api >>/home/dbhub/output.log 2>&1 &'" >> /usr/local/bin/restart.sh && \
134+
echo "su - dbhub -c 'if [ -f "${DBHUB_SOURCE}/.env" ]; then source ${DBHUB_SOURCE}/.env; fi; CONFIG_FILE=${CONFIG_FILE} nohup /usr/local/bin/dbhub-db4s >>/home/dbhub/output.log 2>&1 &'" >> /usr/local/bin/restart.sh && \
135135
echo "" >> /usr/local/bin/restart.sh && \
136136
echo "# Delay long enough for the DBHub.io daemons to start" >> /usr/local/bin/restart.sh && \
137137
echo "sleep 1" >> /usr/local/bin/restart.sh && \
@@ -149,9 +149,9 @@ RUN echo "# Kill the existing running daemons" >> /usr/local/bin/debug.sh && \
149149
echo "if [ -c /dev/console ]; then" >> /usr/local/bin/debug.sh && \
150150
echo " chmod o+w /dev/console" >> /usr/local/bin/debug.sh && \
151151
echo "fi" >> /usr/local/bin/debug.sh && \
152-
echo "su - dbhub -c 'CONFIG_FILE=/dbhub.io/docker/config.toml nohup dlv --listen=:2345 --headless=true --api-version=2 --accept-multiclient exec /usr/local/bin/dbhub-webui >>/home/dbhub/output.log 2>&1 &'" >> /usr/local/bin/debug.sh && \
153-
echo "su - dbhub -c 'CONFIG_FILE=/dbhub.io/docker/config.toml nohup dlv --listen=:2346 --headless=true --api-version=2 --accept-multiclient exec /usr/local/bin/dbhub-api >>/home/dbhub/output.log 2>&1 &'" >> /usr/local/bin/debug.sh && \
154-
echo "su - dbhub -c 'CONFIG_FILE=/dbhub.io/docker/config.toml nohup dlv --listen=:2347 --headless=true --api-version=2 --accept-multiclient exec /usr/local/bin/dbhub-db4s >>/home/dbhub/output.log 2>&1 &'" >> /usr/local/bin/debug.sh && \
152+
echo "su - dbhub -c 'if [ -f "${DBHUB_SOURCE}/.env" ]; then source ${DBHUB_SOURCE}/.env; fi; CONFIG_FILE=${CONFIG_FILE} nohup dlv --listen=:2345 --headless=true --api-version=2 --accept-multiclient exec /usr/local/bin/dbhub-webui >>/home/dbhub/output.log 2>&1 &'" >> /usr/local/bin/debug.sh && \
153+
echo "su - dbhub -c 'if [ -f "${DBHUB_SOURCE}/.env" ]; then source ${DBHUB_SOURCE}/.env; fi; CONFIG_FILE=${CONFIG_FILE} nohup dlv --listen=:2346 --headless=true --api-version=2 --accept-multiclient exec /usr/local/bin/dbhub-api >>/home/dbhub/output.log 2>&1 &'" >> /usr/local/bin/debug.sh && \
154+
echo "su - dbhub -c 'if [ -f "${DBHUB_SOURCE}/.env" ]; then source ${DBHUB_SOURCE}/.env; fi; CONFIG_FILE=${CONFIG_FILE} nohup dlv --listen=:2347 --headless=true --api-version=2 --accept-multiclient exec /usr/local/bin/dbhub-db4s >>/home/dbhub/output.log 2>&1 &'" >> /usr/local/bin/debug.sh && \
155155
echo "" >> /usr/local/bin/debug.sh && \
156156
echo "# Delay long enough for the DBHub.io daemons to start" >> /usr/local/bin/debug.sh && \
157157
echo "sleep 1" >> /usr/local/bin/debug.sh && \

0 commit comments

Comments
 (0)