@@ -96,9 +96,9 @@ RUN GOBIN=/usr/local/bin go install github.com/go-delve/delve/cmd/dlv@latest
96
96
# Add script pieces for starting DBHub.io services
97
97
# Note that we only background the webui and api daemons. The db4s daemon is left running, to prevent start.sh from exiting
98
98
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 && \
102
102
echo "while :; do" >> /usr/local/bin/start.sh && \
103
103
echo " sleep 5" >> /usr/local/bin/start.sh && \
104
104
echo "done" >> /usr/local/bin/start.sh
@@ -129,9 +129,9 @@ RUN echo "# Kill the existing running daemons" >> /usr/local/bin/restart.sh && \
129
129
echo "if [ -c /dev/console ]; then" >> /usr/local/bin/restart.sh && \
130
130
echo " chmod o+w /dev/console" >> /usr/local/bin/restart.sh && \
131
131
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 && \
135
135
echo "" >> /usr/local/bin/restart.sh && \
136
136
echo "# Delay long enough for the DBHub.io daemons to start" >> /usr/local/bin/restart.sh && \
137
137
echo "sleep 1" >> /usr/local/bin/restart.sh && \
@@ -149,9 +149,9 @@ RUN echo "# Kill the existing running daemons" >> /usr/local/bin/debug.sh && \
149
149
echo "if [ -c /dev/console ]; then" >> /usr/local/bin/debug.sh && \
150
150
echo " chmod o+w /dev/console" >> /usr/local/bin/debug.sh && \
151
151
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 && \
155
155
echo "" >> /usr/local/bin/debug.sh && \
156
156
echo "# Delay long enough for the DBHub.io daemons to start" >> /usr/local/bin/debug.sh && \
157
157
echo "sleep 1" >> /usr/local/bin/debug.sh && \
0 commit comments