diff --git a/.github/workflows/deploy-docker-gce.yml b/.github/workflows/deploy-docker-gce.yml index 670bc95..5708e15 100644 --- a/.github/workflows/deploy-docker-gce.yml +++ b/.github/workflows/deploy-docker-gce.yml @@ -3,7 +3,7 @@ name: Deploy to Google Compute Engine on: push: branches: - - master + - dev jobs: build-and-push: diff --git a/Dockerfile b/Dockerfile index fa99f8c..fd6c4f8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,8 +11,8 @@ RUN mkdir -p logs/ && \ apt install -y libpq5 procps cron && \ pip install -r /requirements/live.txt && \ chmod -R 755 /src/jobs/ && \ - echo "30 */8 * * * /src/jobs/health_check.sh" >> /var/spool/cron/crontabs/root && \ - echo "0 18 * * * /src/jobs/remind_snap_up.sh" >> /var/spool/cron/crontabs/root && \ - printenv > /etc/environment + echo "30 */8 * * * su root /src/jobs/health_check.sh" >> /var/spool/cron/crontabs/root && \ + echo "0 18 * * * su root /src/jobs/remind_snap_up.sh" >> /var/spool/cron/crontabs/root && \ + set > /etc/environment CMD nohup python manage.py continue_snap_up & cron && gunicorn --bind=0.0.0.0:8000 --timeout=300 --keep-alive=60 src.wsgi:application diff --git a/requirements/live.txt b/requirements/live.txt index a8774fb..a3806d6 100644 --- a/requirements/live.txt +++ b/requirements/live.txt @@ -12,8 +12,8 @@ gunicorn==23.0.0 humanfriendly==10.0 idna==3.7 mpmath==1.3.0 -numpy==1.26.4 -onnxruntime==1.18.1 +numpy==2.0.1 +onnxruntime==1.19.0 opencv-python-headless==4.10.0.84 packaging==24.1 phonenumbers==8.13.43 diff --git a/src/jobs/health_check.sh b/src/jobs/health_check.sh index 840f7cc..7098972 100755 --- a/src/jobs/health_check.sh +++ b/src/jobs/health_check.sh @@ -1,6 +1,4 @@ -#!/bin/bash -export PATH=/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin +source /etc/environment -source /etc/environment >> /src/logs/cron.log 2>&1 cd /src -python manage.py snap_up_health_check >> /src/logs/cron.log 2>&1 +python manage.py snap_up_health_check diff --git a/src/jobs/remind_snap_up.sh b/src/jobs/remind_snap_up.sh index d1076a0..2fd1fca 100755 --- a/src/jobs/remind_snap_up.sh +++ b/src/jobs/remind_snap_up.sh @@ -1,6 +1,4 @@ -#!/bin/bash -export PATH=/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin +source /etc/environment -source /etc/environment >> /src/logs/cron.log 2>&1 cd /src -python manage.py remind_snap_up >> /src/logs/cron.log 2>&1 \ No newline at end of file +python manage.py remind_snap_up \ No newline at end of file