diff --git a/Dockerfile b/Dockerfile index 5975ed48b..cbd9ca527 100644 --- a/Dockerfile +++ b/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 \ diff --git a/env.example b/env.example new file mode 100644 index 000000000..ec3018b45 --- /dev/null +++ b/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 diff --git a/setup_utils/start.sh b/setup_utils/start.sh index 980a546a0..77a279322 100644 --- a/setup_utils/start.sh +++ b/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" diff --git a/setup_utils/supervisord.conf b/setup_utils/supervisord.conf index f20cf099c..859532379 100644 --- a/setup_utils/supervisord.conf +++ b/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