fixes to app images

aio/Dockerfile-app

@@ -144,6 +144,10 @@ RUN sed -i 's/PGHOST/POSTGRES_HOST/g' /app/plane.env && \
     sed -i 's/plane-redis/localhost/g' /app/plane.env && \
     sed -i 's/plane-minio/localhost/g' /app/plane.env
 
+RUN set -o allexport && \
+    source /app/plane.env set && \
+    set +o allexport
+
 COPY ./aio/nginx.conf /etc/nginx/nginx.conf.template
 
 # if build type is full, run the below copy pg-setup.sh

aio/aio.sh

@@ -1,6 +1,12 @@
 #!/bin/bash
 set -e
 
+set -o allexport
+source plane.env set
+set +o allexport
+
+export REDIS_URL="redis://$REDIS_HOST:$REDIS_PORT"
+
 if [ "$1" = 'api' ]; then
     cd /app/api
     exec ./bin/docker-entrypoint-api.sh

aio/env.sh

@@ -1,5 +1,9 @@
 #!/bin/sh
 
+set -o allexport
+source /app/plane.env set
+set +o allexport
+
 export dollar="$"
 export http_upgrade="http_upgrade"
 export scheme="scheme"

aio/pg-setup.sh

@@ -4,7 +4,7 @@ if [ "$BUILD_TYPE" == "full" ]; then
 
     # Variables
     set -o allexport
-    source plane.env set
+    source /app/plane.env set
     set +o allexport
 
     export PGHOST=localhost

aio/postgresql.conf

@@ -802,7 +802,7 @@ default_text_search_config = 'pg_catalog.english'
 # default postgresql.conf.  Note that these are directives, not variable
 # assignments, so they can usefully be given more than once.
 
-include_dir = 'conf.d'			# include files ending in '.conf' from
+# include_dir = 'conf.d'			# include files ending in '.conf' from
 					# a directory, e.g., 'conf.d'
 #include_if_exists = '...'		# include file only if it exists
 #include = '...'			# include file

aio/supervisord-full-base

@@ -14,7 +14,7 @@ stdout_logfile=/app/logs/access/redis.log
 
 [program:postgresql]
 user=postgres
-command=/usr/lib/postgresql/15/bin/postgres --config-file=/etc/postgresql/15/main/postgresql.conf
+command=/usr/lib/postgresql/15/bin/postgres --config-file=/etc/postgresql/postgresql.conf
 autostart=true
 autorestart=true
 stderr_logfile=/app/logs/error/postgresql.err.log