From 0925aac86b1528dd5c432b60a81bcefda2fe8823 Mon Sep 17 00:00:00 2001 From: Administrator Date: Sun, 21 Aug 2022 13:04:35 +0300 Subject: [PATCH] services --- .deploy/deploy-dev.yaml | 42 +------------------------------------ .deploy/deploy-prod.yaml | 45 +--------------------------------------- run.sh | 4 ++++ 3 files changed, 6 insertions(+), 85 deletions(-) create mode 100644 run.sh diff --git a/.deploy/deploy-dev.yaml b/.deploy/deploy-dev.yaml index 08b06c4..7276055 100644 --- a/.deploy/deploy-dev.yaml +++ b/.deploy/deploy-dev.yaml @@ -21,26 +21,6 @@ services: parallelism: 1 order: start-first - migrations: - image: mathwave/sprint-repo:sprint - command: ./manage.py migrate - networks: - - net - environment: - DB_HOST: "pg.develop.sprinthub.ru" - FS_HOST: "storage" - RABBIT_HOST: "rabbitmq.develop.sprinthub.ru" - REDIS_HOST: "redis.develop.sprinthub.ru" - RABBIT_PASSWORD: $RABBITMQ_PASSWORD_DEV - REDIS_PASSWORD: $REDIS_PASSWORD_DEV - DB_PASSWORD: $DB_PASSWORD_DEV - DEBUG: "true" - TELEGRAM_TOKEN: $TELEGRAM_TOKEN_DEV - deploy: - mode: replicated - restart_policy: - condition: on-failure - web: image: mathwave/sprint-repo:sprint networks: @@ -56,7 +36,7 @@ services: DEBUG: "true" TELEGRAM_TOKEN: $TELEGRAM_TOKEN VK_SERVICE_TOKEN: $VK_SERVICE_TOKEN - command: sh -c "./manage.py collectstatic --noinput && ./manage.py runserver 0.0.0.0:8000 --noreload --insecure" + command: ./run.sh deploy: mode: replicated restart_policy: @@ -236,26 +216,6 @@ services: parallelism: 1 order: start-first - apply-languages: - image: mathwave/sprint-repo:sprint - networks: - - net - command: ./manage.py apply_languages - environment: - DB_HOST: "pg.develop.sprinthub.ru" - FS_HOST: "storage" - RABBIT_HOST: "rabbitmq.develop.sprinthub.ru" - REDIS_HOST: "redis.develop.sprinthub.ru" - RABBIT_PASSWORD: $RABBITMQ_PASSWORD_DEV - REDIS_PASSWORD: $REDIS_PASSWORD_DEV - DB_PASSWORD: $DB_PASSWORD_DEV - DEBUG: "true" - TELEGRAM_TOKEN: $TELEGRAM_TOKEN_DEV - deploy: - mode: replicated - restart_policy: - condition: on-failure - networks: net: driver: overlay diff --git a/.deploy/deploy-prod.yaml b/.deploy/deploy-prod.yaml index 9403bbd..0ad66ad 100644 --- a/.deploy/deploy-prod.yaml +++ b/.deploy/deploy-prod.yaml @@ -49,49 +49,6 @@ services: parallelism: 1 order: start-first - migrations: - image: mathwave/sprint-repo:sprint - command: ./manage.py migrate - networks: - - net - environment: - DB_HOST: "pg.sprinthub.ru" - FS_HOST: "storage" - RABBIT_HOST: "rabbitmq.sprinthub.ru" - REDIS_HOST: "redis.sprinthub.ru" - RABBIT_PASSWORD: $RABBITMQ_PASSWORD_PROD - REDIS_PASSWORD: $REDIS_PASSWORD_PROD - DB_PASSWORD: $DB_PASSWORD - DEBUG: "false" - TELEGRAM_TOKEN: $TELEGRAM_TOKEN - SENTRY_TOKEN: $SENTRY_TOKEN - deploy: - mode: replicated - restart_policy: - condition: on-failure - - apply-languages: - image: mathwave/sprint-repo:sprint - networks: - - net - command: ./manage.py apply_languages - environment: - DB_HOST: "pg.sprinthub.ru" - FS_HOST: "storage" - RABBIT_HOST: "rabbitmq.sprinthub.ru" - REDIS_HOST: "redis.sprinthub.ru" - RABBIT_PASSWORD: $RABBITMQ_PASSWORD_PROD - REDIS_PASSWORD: $REDIS_PASSWORD_PROD - DB_PASSWORD: $DB_PASSWORD - DEBUG: "false" - TELEGRAM_TOKEN: $TELEGRAM_TOKEN - SENTRY_TOKEN: $SENTRY_TOKEN - deploy: - mode: replicated - replicas: 1 - restart_policy: - condition: on-failure - web: image: mathwave/sprint-repo:sprint networks: @@ -107,7 +64,7 @@ services: DEBUG: "false" TELEGRAM_TOKEN: $TELEGRAM_TOKEN VK_SERVICE_TOKEN: $VK_SERVICE_TOKEN - command: sh -c "./manage.py collectstatic --noinput && ./manage.py runserver 0.0.0.0:8000 --noreload --insecure" + command: ./run.sh deploy: mode: replicated placement: diff --git a/run.sh b/run.sh new file mode 100644 index 0000000..92c787a --- /dev/null +++ b/run.sh @@ -0,0 +1,4 @@ +./manage.py collectstatic --noinput +./manage.py migrate +./manage.py apply_languages +./manage.py runserver 0.0.0.0:8000 --noreload --insecure \ No newline at end of file