diff --git a/.env b/.env new file mode 100644 index 0000000..4adc110 --- /dev/null +++ b/.env @@ -0,0 +1,3 @@ +DJANGO_KEY=lkjsdfhlkja9843ö958u9ö34lkjfdlkj +MYSQL_ROOT_PASSWORD=andio2009 +MYSQL_USER=aitrainer \ No newline at end of file diff --git a/.key b/.key deleted file mode 100644 index 9ab8c62..0000000 --- a/.key +++ /dev/null @@ -1,2 +0,0 @@ -MYSQL_ROOT_PASSWORD=andio2009 -MYSQL_USER=root \ No newline at end of file diff --git a/ENV.TXT b/ENV.TXT deleted file mode 100644 index 097263e..0000000 --- a/ENV.TXT +++ /dev/null @@ -1 +0,0 @@ -d:\projects\aitrainer\src\aitrainer_backoffice\aitrainer_backoffice\aitrainer_backoffice\settings\dev.py \ No newline at end of file diff --git a/aitrainer-cron b/aitrainer-cron index c375a84..65a8127 100644 --- a/aitrainer-cron +++ b/aitrainer-cron @@ -1 +1 @@ -*/5 * * * * python /aitrainer_backoffice/aitrainer_backoffice/manage.py runcrons --settings aitrainer_backoffice.settings.deploy >> /var/log/cronjob.log +*/5 * * * * /usr/local/bin/python /aitrainer_backoffice/aitrainer_backoffice/manage.py runcrons --settings aitrainer_backoffice.settings.deploy >> /var/log/cronjob.log > 2>&1 diff --git a/docker-compose.yml b/docker-compose.yml index 2a293c3..047b3aa 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -20,6 +20,16 @@ services: - WORKOUTTEST_SETTING=PROD command: gunicorn aitrainer_backoffice.aitrainer_backoffice.wsgi --env DJANGO_SETTINGS_MODULE=aitrainer_backoffice.aitrainer_backoffice.settings.prod --bind 0.0.0.0:8000 --workers 3 + cronjobs: + build: + context: . + dockerfile: ./Dockerfile + environment: + - GOOGLE_APPLICATION_CREDENTIALS=/aitrainer_backoffice/aitrainer_backoffice/aitrainer_backoffice/asset/aitrainer-firebase-adminsdk.json + - WORKOUTTEST_SETTING=DEPLOY + - DJANGO_KEY=${DJANGO_KEY} + command: ["cron", "-f"] + mysql-server: image: mysql:8.0.21 restart: always @@ -36,8 +46,8 @@ services: restart: always environment: PMA_HOST: mysql-server - PMA_USER: aitrainer - PMA_PASSWORD: andio2009 + PMA_USER: $MYSQL_USER + PMA_PASSWORD: $MYSQL_ROOT_PASSWORD ports: - "8085:80" volumes: @@ -79,8 +89,8 @@ services: - mautic_data:/var/www/html environment: - MAUTIC_DB_HOST=mysql-server - - MAUTIC_DB_USER=aitrainer - - MAUTIC_DB_PASSWORD=andio2009 + - MAUTIC_DB_USER=$MYSQL_USER + - MAUTIC_DB_PASSWORD=$MYSQL_ROOT_PASSWORD - MAUTIC_DB_NAME=mautic - MAUTIC_RUN_CRON_JOBS=true @@ -133,8 +143,8 @@ services: DB_TYPE: mysql DB_HOST: mysql-server DB_PORT: 3306 - DB_USER: aitrainer - DB_PASS: andio2009 + DB_USER: $MYSQL_USER + DB_PASS: $MYSQL_ROOT_PASSWORD DB_NAME: wiki restart: unless-stopped ports: