diff --git a/deploy/docker/Dockerfile b/deploy/docker/Dockerfile index 5ecbbd579d..ba589dffab 100644 --- a/deploy/docker/Dockerfile +++ b/deploy/docker/Dockerfile @@ -263,7 +263,10 @@ COPY --chown=lowcoder:lowcoder --from=lowcoder-ce-node-service /lowcoder/node-se COPY --chown=lowcoder:lowcoder deploy/docker/all-in-one/etc /lowcoder/etc # Add startup script -COPY --chown=lowcoder:lowcoder deploy/docker/all-in-one/entrypoint.sh /lowcoder/entrypoint.sh +COPY --chown=lowcoder:lowcoder --chmod=0755 deploy/docker/all-in-one/entrypoint.sh /lowcoder/entrypoint.sh + +# Copy default environment properties +COPY --chown=lowcoder:lowcoder deploy/docker/default.env /lowcoder/etc/default.env # Fixes for OpenShift compatibility (after all files are copied) RUN echo \ diff --git a/deploy/docker/all-in-one/entrypoint.sh b/deploy/docker/all-in-one/entrypoint.sh index 74403a08d1..c6e8802a7a 100644 --- a/deploy/docker/all-in-one/entrypoint.sh +++ b/deploy/docker/all-in-one/entrypoint.sh @@ -5,6 +5,18 @@ set -e export USER_ID=${LOWCODER_PUID:=9001} export GROUP_ID=${LOWCODER_PGID:=9001} +# Set default variable values +echo "Overriding default environment variables:" +for line in `grep '^[ \t]*LOWCODER_.*$' /lowcoder/etc/default.env`; do + VARNAME=`echo ${line} | sed -e 's/^\([A-Z0-9_]\+\)\([ \t]*=[ \t]*\)\(.*\)$/\1/'` + if [ -z "$(eval echo \"\$$VARNAME\")" ]; then + export $(eval echo "${line}") + else + echo " ${line}" + fi; +done; +echo "Done." + # Update ID of lowcoder user if required if [ ! "$(id --user lowcoder)" -eq ${USER_ID} ]; then usermod --uid ${USER_ID} lowcoder