Docker changes

Dockerfile

@@ -61,7 +61,7 @@ RUN apt-get update && \
     && apt-get install -y nodejs \
     && mkdir -p /etc/cron.d && mv /app/setup_utils/cronjob.txt /etc/cron.d/cronjob \
     && chmod +x /app/setup_utils/start.sh /app/setup_utils/init_db.sh /app/setup_utils/generate_config_ini.sh \
-    && mv ./setup_utils/supervisord.conf /etc/supervisord.conf \
+    && mv /app/setup_utils/supervisord.conf /etc/supervisord.conf \
     && mv /app/database-docker/db/ /app/ && rm -rf /app/database-docker/ \
     && echo "host all  all    0.0.0.0/0  md5" >> /etc/postgresql/15/main/pg_hba.conf \
     && echo "listen_addresses='*'" >> /etc/postgresql/15/main/postgresql.conf \

env.example

@@ -0,0 +1,7 @@
+ENVIRONMENT=prod
+POSTGRES_DB_ENABLED=true
+DB_INIT_ENABLED=true
+REDIS_ENABLED=true
+BACKEND_ENABLED=true
+FRONTEND_ENABLED=true
+CRON_ENABLED=true

setup_utils/start.sh

@@ -20,9 +20,4 @@ fi
 
 echo 'MHQ_STARTING SUPERVISOR'
 
-if [ "$ENVIRONMENT" != "dev" ]; then
-    cd /app/web-server
-    yarn build
-fi
-
 /usr/bin/supervisord -c "/etc/supervisord.conf"

setup_utils/supervisord.conf

@@ -66,7 +66,7 @@ environment=BACKEND_ENABLED=%(ENV_BACKEND_ENABLED)s
 autostart=%(ENV_BACKEND_ENABLED)s
 
 [program:frontend]
-command=/bin/bash -c "yarn http"
+command=/bin/bash -c "source ~/.bashrc && yarn http"
 directory=/app/web-server
 stdout_logfile=/var/log/webserver/webserver.log
 stdout_logfile_maxbytes=512KB