Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Dockerfile.dev
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@ RUN mkdir -p /etc/cron.d && mv /app/setup_utils/cronjob.txt /etc/cron.d/cronjob
RUN chmod +x /app/setup_utils/start.sh /app/setup_utils/init_db.sh /app/setup_utils/generate_config_ini.sh
RUN mv /app/setup_utils/supervisord.conf /etc/supervisord.conf
RUN mv /app/database-docker/db/ /app/ && rm -rf /app/database-docker/
RUN echo "host all all 0.0.0.0/0 md5" >> /etc/postgresql/15/main/pg_hba.conf
RUN echo "host all all 127.0.0.1/32 md5" >> /etc/postgresql/15/main/pg_hba.conf
RUN echo "host all all 192.168.65.1/32 md5" >> /etc/postgresql/15/main/pg_hba.conf
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why this?

RUN echo "listen_addresses='*'" >> /etc/postgresql/15/main/postgresql.conf
RUN sed -i "s/^port = .*/port = ${DB_PORT}/" /etc/postgresql/15/main/postgresql.conf
RUN npm install --global yarn --force
Expand Down
4 changes: 2 additions & 2 deletions cli/source/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@ export const keysForLogSource = Object.entries(LogSource).reduce(
);

export const READY_MESSAGES = {
[LogSource.ApiServer]: `Listening at: http://0.0.0.0`,
[LogSource.SyncServer]: `Listening at: http://0.0.0.0`,
[LogSource.ApiServer]: `Listening at: http://127.0.0.1`,
[LogSource.SyncServer]: `Listening at: http://127.0.0.1`,
[LogSource.WebServer]: [
`Server started on http://localhost`,
`http://localhost:`
Expand Down
4 changes: 2 additions & 2 deletions setup_utils/start_api_server.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ wait_for_message

cd /app/backend/analytics_server || exit
if [ "$ENVIRONMENT" == "prod" ]; then
/opt/venv/bin/gunicorn -w 4 -b 0.0.0.0:$API_SERVER_PORT --timeout 0 --access-logfile '-' --error-logfile '-' app:app
/opt/venv/bin/gunicorn -w 4 -b 127.0.0.1:$API_SERVER_PORT --timeout 0 --access-logfile '-' --error-logfile '-' app:app
else
/opt/venv/bin/gunicorn -w 4 -b 0.0.0.0:$API_SERVER_PORT --timeout 0 --access-logfile '-' --error-logfile '-' --reload app:app
/opt/venv/bin/gunicorn -w 4 -b 127.0.0.1:$API_SERVER_PORT --timeout 0 --access-logfile '-' --error-logfile '-' --reload app:app
fi
4 changes: 2 additions & 2 deletions setup_utils/start_sync_server.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ wait_for_message

cd /app/backend/analytics_server || exit
if [ "$ENVIRONMENT" == "prod" ]; then
/opt/venv/bin/gunicorn -w 2 -b 0.0.0.0:$SYNC_SERVER_PORT --timeout 0 --access-logfile '-' --error-logfile '-' sync_app:app
/opt/venv/bin/gunicorn -w 2 -b 127.0.0.1:$SYNC_SERVER_PORT --timeout 0 --access-logfile '-' --error-logfile '-' sync_app:app
else
/opt/venv/bin/gunicorn -w 2 -b 0.0.0.0:$SYNC_SERVER_PORT --timeout 0 --access-logfile '-' --error-logfile '-' --reload sync_app:app
/opt/venv/bin/gunicorn -w 2 -b 127.0.0.1:$SYNC_SERVER_PORT --timeout 0 --access-logfile '-' --error-logfile '-' --reload sync_app:app
fi