Ci get prod db

remotes/origin/hasaccess^2
Mikhail Lavkin 8 years ago
parent b56dbec434
commit 961f9ac950
  1. 4
      .gitlab-ci.yml
  2. 10
      docker/conf/nginx/conf.d/default.conf
  3. 1
      docker/conf/nginx/nginx.conf
  4. 1
      docker/conf/nginx/sites-enabled/default

@ -57,8 +57,10 @@ prod-db:
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 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
- 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 db psql postgres
- /work/scripts/get_prod_db.sh | docker-compose -f docker-compose-review.yml -p back$CI_COMMIT_REF_NAME exec -T -u postgres db psql lilcity
when: manual
only:
- branches

@ -19,9 +19,19 @@ server {
location /media/instagram/results/ {
expires 1d;
try_files $uri @prod;
}
try_files $uri @prod;
}
location @prod {
if ($host = "lil.school") {
return 404;
}
proxy_pass https://lil.school;
proxy_buffering off;
}
location / {
try_files $uri @django;
}

@ -26,7 +26,6 @@ http {
gzip_types text/plain text/css application/json application/javascript text/xml application/xml application/xml+rss text/javascript;
include /etc/nginx/conf.d/*.conf;
include /etc/nginx/sites-enabled/*;
set_real_ip_from 192.168.0.0/24;
}

@ -1 +0,0 @@
/etc/nginx/sites-available/default
Loading…
Cancel
Save