# Conflicts: # project/templates/blocks/promo.html # project/templates/lilcity/index.htmlremotes/origin/hasaccess^2
nikita
8 years ago
commit
cb98082328
37 changed files with 339 additions and 117 deletions
@ -1,16 +1,66 @@ |
||||
stages: |
||||
- deploy |
||||
- deploy |
||||
- db |
||||
- stop |
||||
|
||||
variables: |
||||
REVIEW_DOMAIN: back-review.lil.school |
||||
|
||||
deploy_prod: |
||||
stage: deploy |
||||
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/site |
||||
name: prod |
||||
url: https://lil.school |
||||
only: |
||||
- master |
||||
tags: |
||||
- prod |
||||
|
||||
deploy_review: |
||||
stage: deploy |
||||
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 |
||||
url: https://$CI_COMMIT_REF_SLUG-$REVIEW_DOMAIN |
||||
on_stop: stop-review |
||||
tags: |
||||
- review |
||||
only: |
||||
- branches |
||||
|
||||
stop-review: |
||||
stage: stop |
||||
environment: |
||||
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}/ |
||||
when: manual |
||||
only: |
||||
- branches |
||||
tags: |
||||
- 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 |
||||
when: manual |
||||
only: |
||||
- branches |
||||
tags: |
||||
- review |
||||
|
||||
@ -0,0 +1,18 @@ |
||||
# Generated by Django 2.0.5 on 2018-06-28 20:00 |
||||
|
||||
from django.db import migrations, models |
||||
|
||||
|
||||
class Migration(migrations.Migration): |
||||
|
||||
dependencies = [ |
||||
('school', '0016_auto_20180429_0818'), |
||||
] |
||||
|
||||
operations = [ |
||||
migrations.AlterField( |
||||
model_name='livelesson', |
||||
name='short_description', |
||||
field=models.TextField(blank=True, default='', verbose_name='Краткое описание урока'), |
||||
), |
||||
] |
||||
@ -0,0 +1,18 @@ |
||||
# Generated by Django 2.0.6 on 2018-06-29 15:01 |
||||
|
||||
from django.db import migrations, models |
||||
|
||||
|
||||
class Migration(migrations.Migration): |
||||
|
||||
dependencies = [ |
||||
('school', '0017_auto_20180628_2000'), |
||||
] |
||||
|
||||
operations = [ |
||||
migrations.AlterField( |
||||
model_name='livelesson', |
||||
name='title', |
||||
field=models.CharField(blank=True, default='', max_length=100, verbose_name='Название урока'), |
||||
), |
||||
] |
||||
@ -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 |
||||
@ -0,0 +1,58 @@ |
||||
version: '3' |
||||
|
||||
services: |
||||
db: |
||||
image: postgres:10.3-alpine |
||||
restart: always |
||||
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 |
||||
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 |
||||
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 |
||||
@ -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 |
||||
|
||||
|
After Width: | Height: | Size: 551 KiB |
|
After Width: | Height: | Size: 396 KiB |
|
After Width: | Height: | Size: 584 KiB |
|
After Width: | Height: | Size: 600 KiB |
Loading…
Reference in new issue