From 06830f6c6320502c6f307cb559e4495520feb031 Mon Sep 17 00:00:00 2001 From: root Date: Mon, 2 Jul 2018 22:42:22 +0300 Subject: [PATCH 1/8] review --- .gitlab-ci.yml | 58 +++++++++++++++++++++++++++-- docker/docker-compose-prod.yml | 7 ++++ docker/docker-compose-review.yml | 64 ++++++++++++++++++++++++++++++++ docker/entrypoint_app.sh | 1 + 4 files changed, 127 insertions(+), 3 deletions(-) create mode 100644 docker/docker-compose-review.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9a2b0562..2f95e77f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,10 @@ stages: - - deploy + - deploy + - db + - stop + +variables: + REVIEW_DOMAIN: back-review.lil.school deploy_prod: stage: deploy @@ -8,9 +13,56 @@ deploy_prod: - cd /work/www/lil.school/docker/ - docker-compose -f docker-compose-prod.yml up --build -d environment: - name: prod/site + name: prod url: https://lil.school only: - - master + - release tags: - prod + +deploy_review: + stage: deploy + script: + - cd docker + - docker-compose -f docker-compose-review.yml -p back$CI_COMMIT_REF_NAME up --build -d + environment: + name: review/$CI_COMMIT_REF_SLUG + url: https://$CI_COMMIT_REF_SLUG-$REVIEW_DOMAIN + on_stop: stop-review + tags: + - review + only: + - branches + except: + - release + +stop-review: + stage: stop + environment: + name: review/$CI_COMMIT_REF_SLUG + action: stop + script: + - cd docker + - docker-compose -f docker-compose-review.yml -p back$CI_COMMIT_REF_NAME down + - rm -rf /work/data/back_${CI_COMMIT_REF_NAME}/ + when: manual + only: + - branches + except: + - release + tags: + - review + +prod-db: + stage: db + script: + - cd docker + - docker-compose -f docker-compose-review.yml -p back$CI_COMMIT_REF_NAME restart db + - echo 'DROP DATABASE IF EXISTS lilcity; CREATE DATABASE lilcity' | docker-compose -f docker-compose-review.yml -p back$CI_COMMIT_REF_NAME exec -T -u postgres postgres psql postgres + when: manual + only: + - branches + except: + - release + tags: + - review diff --git a/docker/docker-compose-prod.yml b/docker/docker-compose-prod.yml index 440f2cbf..c3b97c9e 100644 --- a/docker/docker-compose-prod.yml +++ b/docker/docker-compose-prod.yml @@ -10,6 +10,11 @@ services: - .env volumes: - ./data/postgres:/var/lib/postgresql/data + logging: &logging + driver: "json-file" + options: + max-size: "1m" + max-file: "1" redis: image: redis:4.0.9-alpine @@ -18,6 +23,7 @@ services: - "127.0.0.1:6379:6379" volumes: - ./data/redis:/data + logging: *logging app: build: @@ -36,3 +42,4 @@ services: links: - db - redis + logging: *logging diff --git a/docker/docker-compose-review.yml b/docker/docker-compose-review.yml new file mode 100644 index 00000000..e84063a1 --- /dev/null +++ b/docker/docker-compose-review.yml @@ -0,0 +1,64 @@ +version: '3' + +services: + db: + image: postgres:10.3-alpine + restart: always + ports: + - "5432:5432" + env_file: + - .env + volumes: + - /work/data/back_${CI_COMMIT_REF_NAME}/postgres:/var/lib/postgresql/data + logging: &logging + driver: "json-file" + options: + max-size: "1m" + max-file: "1" + networks: + - internal + - review + labels: + - traefik.enable=false + + redis: + image: redis:4.0.9-alpine + restart: always + ports: + - "127.0.0.1:6379:6379" + volumes: + - /work/data/back_${CI_COMMIT_REF_NAME}/redis:/data + logging: *logging + networks: + - internal + - review + labels: + - traefik.enable=false + + app: + build: + context: ../ + dockerfile: docker/Dockerfile + restart: always + env_file: + - .env + volumes: + - /work/data/back_${CI_COMMIT_REF_NAME}/media:/app/media + ports: + - "${PORT}:80" + depends_on: + - db + - redis + logging: *logging + networks: + - internal + - review + labels: + - traefik.frontend.rule=Host:${REVIEW_HOST} + - traefik.docker.network=review + +networks: + internal: + review: + external: + name: review diff --git a/docker/entrypoint_app.sh b/docker/entrypoint_app.sh index a61879d2..a346f89c 100755 --- a/docker/entrypoint_app.sh +++ b/docker/entrypoint_app.sh @@ -1,5 +1,6 @@ #!/bin/sh cd /app +chown www-data:www-data /app/media python manage.py migrate #python manage.py loaddata /app/apps/*/fixtures/*.json python2.7 /usr/bin/supervisord -n From ad9eec21546071847bf6b9a828519ba117b4f810 Mon Sep 17 00:00:00 2001 From: root Date: Mon, 2 Jul 2018 22:48:11 +0300 Subject: [PATCH 2/8] review --- docker/docker-compose-review.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/docker/docker-compose-review.yml b/docker/docker-compose-review.yml index e84063a1..9413f978 100644 --- a/docker/docker-compose-review.yml +++ b/docker/docker-compose-review.yml @@ -4,8 +4,6 @@ services: db: image: postgres:10.3-alpine restart: always - ports: - - "5432:5432" env_file: - .env volumes: @@ -24,8 +22,6 @@ services: redis: image: redis:4.0.9-alpine restart: always - ports: - - "127.0.0.1:6379:6379" volumes: - /work/data/back_${CI_COMMIT_REF_NAME}/redis:/data logging: *logging @@ -44,8 +40,6 @@ services: - .env volumes: - /work/data/back_${CI_COMMIT_REF_NAME}/media:/app/media - ports: - - "${PORT}:80" depends_on: - db - redis From ed2ed3fe44c8b5cfa3dc5f4be3e7eeb578d40c4d Mon Sep 17 00:00:00 2001 From: root Date: Mon, 2 Jul 2018 22:49:43 +0300 Subject: [PATCH 3/8] review --- .gitlab-ci.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2f95e77f..181d5ba8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -23,6 +23,7 @@ deploy_prod: deploy_review: stage: deploy script: + - export REVIEW_HOST=$CI_COMMIT_REF_SLUG-$REVIEW_DOMAIN - cd docker - docker-compose -f docker-compose-review.yml -p back$CI_COMMIT_REF_NAME up --build -d environment: @@ -42,6 +43,7 @@ stop-review: name: review/$CI_COMMIT_REF_SLUG action: stop script: + - export REVIEW_HOST=$CI_COMMIT_REF_SLUG-$REVIEW_DOMAIN - cd docker - docker-compose -f docker-compose-review.yml -p back$CI_COMMIT_REF_NAME down - rm -rf /work/data/back_${CI_COMMIT_REF_NAME}/ @@ -56,6 +58,7 @@ stop-review: prod-db: stage: db script: + - export REVIEW_HOST=$CI_COMMIT_REF_SLUG-$REVIEW_DOMAIN - cd docker - docker-compose -f docker-compose-review.yml -p back$CI_COMMIT_REF_NAME restart db - echo 'DROP DATABASE IF EXISTS lilcity; CREATE DATABASE lilcity' | docker-compose -f docker-compose-review.yml -p back$CI_COMMIT_REF_NAME exec -T -u postgres postgres psql postgres From 654d6c7cd6fb29d24da6f0f57ae3536fab362978 Mon Sep 17 00:00:00 2001 From: root Date: Mon, 2 Jul 2018 22:51:35 +0300 Subject: [PATCH 4/8] review --- .gitlab-ci.yml | 1 + docker/.env.review | 22 ++++++++++++++++++++++ 2 files changed, 23 insertions(+) create mode 100644 docker/.env.review diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 181d5ba8..cb9cab82 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -25,6 +25,7 @@ deploy_review: script: - export REVIEW_HOST=$CI_COMMIT_REF_SLUG-$REVIEW_DOMAIN - cd docker + - cp .env.review .env - docker-compose -f docker-compose-review.yml -p back$CI_COMMIT_REF_NAME up --build -d environment: name: review/$CI_COMMIT_REF_SLUG diff --git a/docker/.env.review b/docker/.env.review new file mode 100644 index 00000000..bc750b18 --- /dev/null +++ b/docker/.env.review @@ -0,0 +1,22 @@ +# DEBUG=True +ALLOWED_HOSTS=* +PORT=8000 +CORS_ORIGIN_WHITELIST=lilcity.9ev.ru:8080 +LANG=ru_RU.UTF-8 +POSTGRES_DB=lilcity +POSTGRES_USER=lilcity +POSTGRES_PASSWORD=GPVs/E/{5&qe +DJANGO_SETTINGS_MODULE=project.settings +DATABASE_SERVICE_HOST=db +SECRET_KEY=jelm*91lj(_-o20+6^a+bgv!4s6e_efry^#+f#=1ak&s1xr-2j +MAILGUN_API_KEY=key-ec6af2d43d031d59bff6b1c8fb9390cb +MAILGUN_SENDER_DOMAIN=mail.9ev.ru +DEFAULT_FROM_EMAIL=postmaster@mail.9ev.ru +TWILIO_ACCOUNT=ACdf4a96b776cc764bc3ec0f0e136ba550 +TWILIO_TOKEN=559a6b1fce121759c9af2dcbb3f755ea +TWILIO_FROM_PHONE=+37128914409 +PAYMENTWALL_APP_KEY=d6f02b90cf6b16220932f4037578aff7 +PAYMENTWALL_SECRET_KEY=4ea515bf94e34cf28646c2e12a7b8707 +MIXPANEL_TOKEN=79bd6bfd98667ed977737e6810b8abcd +RAVEN_DSN=https://b545dac0ae0545a1bcfc443326fe5850:6f9c900cef7f4c11b63561030b37d15c@sentry.io/1197254 +ROISTAT_COUNTER_ID=09db30c750035ae3d70a41d5f10d59ec From 817a6110c0a128824ed8d02874f2a5f104d646aa Mon Sep 17 00:00:00 2001 From: root Date: Mon, 2 Jul 2018 23:07:49 +0300 Subject: [PATCH 5/8] review --- docker/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/Dockerfile b/docker/Dockerfile index 46722a2f..acaa74c8 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -18,4 +18,5 @@ ADD . /app/ COPY --from=front /web/build/ /app/web/build/ RUN python manage.py collectstatic --no-input RUN rm -rf /etc/nginx/ && cp -r docker/conf/nginx /etc/ && cp -r docker/conf/supervisor/* /etc/supervisor/conf.d/ && chown -R www-data:www-data /app/ +EXPOSE 80 ENTRYPOINT ["/app/docker/entrypoint_app.sh"] From 4be21776df51c6908fe0e1caead67b8fa7b4a899 Mon Sep 17 00:00:00 2001 From: nikita Date: Tue, 3 Jul 2018 18:30:18 +0300 Subject: [PATCH 6/8] test --- project/templates/blocks/promo.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/templates/blocks/promo.html b/project/templates/blocks/promo.html index 49fde3ee..ba61ac8e 100644 --- a/project/templates/blocks/promo.html +++ b/project/templates/blocks/promo.html @@ -12,7 +12,7 @@ Lil School — первая образовательная онлайн-платформа креативного мышления для детей
- Урок Рисовальный лагерь, Альбрехт Дюрер начнется сегодня в 17:00 + Урок Рисовальный лагерь, Альбрехт Дюрер начнется завтра в 17:00
{% if is_purchased %} From 7a8fcbf082fc20abfb1dde4541a08cee53322c20 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 4 Jul 2018 12:20:02 +0300 Subject: [PATCH 7/8] review --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cb9cab82..e86bed7f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -11,7 +11,7 @@ deploy_prod: script: - rsync -a --stats --delete --exclude="docker/data/" --exclude="docker/.env" ./ /work/www/lil.school/ - cd /work/www/lil.school/docker/ - - docker-compose -f docker-compose-prod.yml up --build -d + - docker-compose -f docker-compose-prod.yml -p back up --build -d environment: name: prod url: https://lil.school From 4d19fc5bceffe9a3647329b3514a0eeecac26ae9 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 4 Jul 2018 12:48:03 +0300 Subject: [PATCH 8/8] review --- .gitlab-ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e86bed7f..3a25f056 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -16,7 +16,7 @@ deploy_prod: name: prod url: https://lil.school only: - - release + - master tags: - prod @@ -36,7 +36,7 @@ deploy_review: only: - branches except: - - release + - master stop-review: stage: stop @@ -52,7 +52,7 @@ stop-review: only: - branches except: - - release + - master tags: - review @@ -67,6 +67,6 @@ prod-db: only: - branches except: - - release + - master tags: - review