From 2af3ce42ad53998a48d37c63d6aa5810cedf850e Mon Sep 17 00:00:00 2001 From: root Date: Sun, 6 May 2018 22:58:25 +0300 Subject: [PATCH] CI --- .dockerignore | 5 +- .gitlab-ci.yml | 16 +++ Dockerfile | 10 -- .env.example => docker/.env.example | 1 - docker/Dockerfile | 21 +++ docker/conf/nginx/fastcgi.conf | 25 ++++ docker/conf/nginx/fastcgi_params | 24 ++++ docker/conf/nginx/koi-utf | 109 +++++++++++++++ docker/conf/nginx/koi-win | 103 +++++++++++++++ docker/conf/nginx/mime.types | 89 +++++++++++++ docker/conf/nginx/nginx.conf | 85 ++++++++++++ docker/conf/nginx/proxy_params | 4 + docker/conf/nginx/scgi_params | 16 +++ docker/conf/nginx/sites-available/default | 22 +++ docker/conf/nginx/sites-enabled/default | 1 + docker/conf/nginx/snippets/fastcgi-php.conf | 13 ++ docker/conf/nginx/snippets/snakeoil.conf | 5 + docker/conf/nginx/uwsgi_params | 16 +++ docker/conf/nginx/win-utf | 125 ++++++++++++++++++ docker/conf/supervisor/celery.conf | 14 ++ docker/conf/supervisor/celery_beat.conf | 14 ++ docker/conf/supervisor/nginx.conf | 10 ++ docker/conf/supervisor/uwsgi.conf | 14 ++ .../docker-compose-dev.yml_notwork | 0 docker/docker-compose-prod.yml | 34 +++++ docker/entrypoint_app.sh | 5 + 26 files changed, 766 insertions(+), 15 deletions(-) create mode 100644 .gitlab-ci.yml delete mode 100644 Dockerfile rename .env.example => docker/.env.example (95%) create mode 100644 docker/Dockerfile create mode 100644 docker/conf/nginx/fastcgi.conf create mode 100644 docker/conf/nginx/fastcgi_params create mode 100644 docker/conf/nginx/koi-utf create mode 100644 docker/conf/nginx/koi-win create mode 100644 docker/conf/nginx/mime.types create mode 100644 docker/conf/nginx/nginx.conf create mode 100644 docker/conf/nginx/proxy_params create mode 100644 docker/conf/nginx/scgi_params create mode 100644 docker/conf/nginx/sites-available/default create mode 120000 docker/conf/nginx/sites-enabled/default create mode 100644 docker/conf/nginx/snippets/fastcgi-php.conf create mode 100644 docker/conf/nginx/snippets/snakeoil.conf create mode 100644 docker/conf/nginx/uwsgi_params create mode 100644 docker/conf/nginx/win-utf create mode 100644 docker/conf/supervisor/celery.conf create mode 100644 docker/conf/supervisor/celery_beat.conf create mode 100644 docker/conf/supervisor/nginx.conf create mode 100644 docker/conf/supervisor/uwsgi.conf rename docker-compose.yml => docker/docker-compose-dev.yml_notwork (100%) create mode 100644 docker/docker-compose-prod.yml create mode 100755 docker/entrypoint_app.sh diff --git a/.dockerignore b/.dockerignore index 0e6f0ef1..a568f8be 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,4 +1 @@ -venv*/ -web/node_modules/ -redis_data/ -postgres_data/ +docker/data/ diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 00000000..059f0b53 --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,16 @@ +stages: + - deploy + +deploy_prod: + stage: deploy + script: + - rsync -a --stats --delete --exclude="docker/data/" ./ /work/www/lil.school/ + - cd /work/www/lil.school/docker/ + - docker-compose -f docker-compose-prod.yml up --build + environment: + name: prod + url: https://lil.school + only: + - master + tags: + - prod diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index 60477cfb..00000000 --- a/Dockerfile +++ /dev/null @@ -1,10 +0,0 @@ -FROM python:3.6 -ENV PYTHONUNBUFFERED 1 -RUN mkdir /lilcity -WORKDIR /lilcity - -ADD requirements.txt /lilcity/ -RUN pip install -r requirements.txt -RUN rm -rf /root/.cache/pip/wheels/* - -ADD . /lilcity/ diff --git a/.env.example b/docker/.env.example similarity index 95% rename from .env.example rename to docker/.env.example index a1992012..afc3f744 100644 --- a/.env.example +++ b/docker/.env.example @@ -6,7 +6,6 @@ LANG=ru_RU.UTF-8 POSTGRES_DB=lilcity POSTGRES_USER=lilcity POSTGRES_PASSWORD=GPVs/E/{5&qe -PGDATA=/var/lib/postgresql/data/pgdata DJANGO_SETTINGS_MODULE=project.settings DATABASE_SERVICE_HOST=db SECRET_KEY=jelm*91lj(_-o20+6^a+bgv!4s6e_efry^#+f#=1ak&s1xr-2j diff --git a/docker/Dockerfile b/docker/Dockerfile new file mode 100644 index 00000000..46722a2f --- /dev/null +++ b/docker/Dockerfile @@ -0,0 +1,21 @@ +FROM node:9.11.1-alpine as front +RUN apk update && apk add python alpine-sdk --no-cache +WORKDIR /web/ +ADD ./web/yarn.lock /web/ +ADD ./web/package.json /web/ +RUN yarn install +ADD ./web/ /web/ +RUN yarn build + +FROM python:3.6 +ENV PYTHONUNBUFFERED 1 +RUN apt-get update && apt-get install -y nginx supervisor +RUN pip3 install --no-cache-dir --upgrade pip uwsgi==2.0.17 +WORKDIR /app/ +ADD requirements.txt /app/ +RUN pip install --no-cache-dir -r requirements.txt +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/ +ENTRYPOINT ["/app/docker/entrypoint_app.sh"] diff --git a/docker/conf/nginx/fastcgi.conf b/docker/conf/nginx/fastcgi.conf new file mode 100644 index 00000000..ac9ff920 --- /dev/null +++ b/docker/conf/nginx/fastcgi.conf @@ -0,0 +1,25 @@ + +fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; +fastcgi_param QUERY_STRING $query_string; +fastcgi_param REQUEST_METHOD $request_method; +fastcgi_param CONTENT_TYPE $content_type; +fastcgi_param CONTENT_LENGTH $content_length; + +fastcgi_param SCRIPT_NAME $fastcgi_script_name; +fastcgi_param REQUEST_URI $request_uri; +fastcgi_param DOCUMENT_URI $document_uri; +fastcgi_param DOCUMENT_ROOT $document_root; +fastcgi_param SERVER_PROTOCOL $server_protocol; +fastcgi_param HTTPS $https if_not_empty; + +fastcgi_param GATEWAY_INTERFACE CGI/1.1; +fastcgi_param SERVER_SOFTWARE nginx/$nginx_version; + +fastcgi_param REMOTE_ADDR $remote_addr; +fastcgi_param REMOTE_PORT $remote_port; +fastcgi_param SERVER_ADDR $server_addr; +fastcgi_param SERVER_PORT $server_port; +fastcgi_param SERVER_NAME $server_name; + +# PHP only, required if PHP was built with --enable-force-cgi-redirect +fastcgi_param REDIRECT_STATUS 200; diff --git a/docker/conf/nginx/fastcgi_params b/docker/conf/nginx/fastcgi_params new file mode 100644 index 00000000..71e2c2e3 --- /dev/null +++ b/docker/conf/nginx/fastcgi_params @@ -0,0 +1,24 @@ + +fastcgi_param QUERY_STRING $query_string; +fastcgi_param REQUEST_METHOD $request_method; +fastcgi_param CONTENT_TYPE $content_type; +fastcgi_param CONTENT_LENGTH $content_length; + +fastcgi_param SCRIPT_NAME $fastcgi_script_name; +fastcgi_param REQUEST_URI $request_uri; +fastcgi_param DOCUMENT_URI $document_uri; +fastcgi_param DOCUMENT_ROOT $document_root; +fastcgi_param SERVER_PROTOCOL $server_protocol; +fastcgi_param HTTPS $https if_not_empty; + +fastcgi_param GATEWAY_INTERFACE CGI/1.1; +fastcgi_param SERVER_SOFTWARE nginx/$nginx_version; + +fastcgi_param REMOTE_ADDR $remote_addr; +fastcgi_param REMOTE_PORT $remote_port; +fastcgi_param SERVER_ADDR $server_addr; +fastcgi_param SERVER_PORT $server_port; +fastcgi_param SERVER_NAME $server_name; + +# PHP only, required if PHP was built with --enable-force-cgi-redirect +fastcgi_param REDIRECT_STATUS 200; diff --git a/docker/conf/nginx/koi-utf b/docker/conf/nginx/koi-utf new file mode 100644 index 00000000..e7974ff6 --- /dev/null +++ b/docker/conf/nginx/koi-utf @@ -0,0 +1,109 @@ + +# This map is not a full koi8-r <> utf8 map: it does not contain +# box-drawing and some other characters. Besides this map contains +# several koi8-u and Byelorussian letters which are not in koi8-r. +# If you need a full and standard map, use contrib/unicode2nginx/koi-utf +# map instead. + +charset_map koi8-r utf-8 { + + 80 E282AC ; # euro + + 95 E280A2 ; # bullet + + 9A C2A0 ; #   + + 9E C2B7 ; # · + + A3 D191 ; # small yo + A4 D194 ; # small Ukrainian ye + + A6 D196 ; # small Ukrainian i + A7 D197 ; # small Ukrainian yi + + AD D291 ; # small Ukrainian soft g + AE D19E ; # small Byelorussian short u + + B0 C2B0 ; # ° + + B3 D081 ; # capital YO + B4 D084 ; # capital Ukrainian YE + + B6 D086 ; # capital Ukrainian I + B7 D087 ; # capital Ukrainian YI + + B9 E28496 ; # numero sign + + BD D290 ; # capital Ukrainian soft G + BE D18E ; # capital Byelorussian short U + + BF C2A9 ; # (C) + + C0 D18E ; # small yu + C1 D0B0 ; # small a + C2 D0B1 ; # small b + C3 D186 ; # small ts + C4 D0B4 ; # small d + C5 D0B5 ; # small ye + C6 D184 ; # small f + C7 D0B3 ; # small g + C8 D185 ; # small kh + C9 D0B8 ; # small i + CA D0B9 ; # small j + CB D0BA ; # small k + CC D0BB ; # small l + CD D0BC ; # small m + CE D0BD ; # small n + CF D0BE ; # small o + + D0 D0BF ; # small p + D1 D18F ; # small ya + D2 D180 ; # small r + D3 D181 ; # small s + D4 D182 ; # small t + D5 D183 ; # small u + D6 D0B6 ; # small zh + D7 D0B2 ; # small v + D8 D18C ; # small soft sign + D9 D18B ; # small y + DA D0B7 ; # small z + DB D188 ; # small sh + DC D18D ; # small e + DD D189 ; # small shch + DE D187 ; # small ch + DF D18A ; # small hard sign + + E0 D0AE ; # capital YU + E1 D090 ; # capital A + E2 D091 ; # capital B + E3 D0A6 ; # capital TS + E4 D094 ; # capital D + E5 D095 ; # capital YE + E6 D0A4 ; # capital F + E7 D093 ; # capital G + E8 D0A5 ; # capital KH + E9 D098 ; # capital I + EA D099 ; # capital J + EB D09A ; # capital K + EC D09B ; # capital L + ED D09C ; # capital M + EE D09D ; # capital N + EF D09E ; # capital O + + F0 D09F ; # capital P + F1 D0AF ; # capital YA + F2 D0A0 ; # capital R + F3 D0A1 ; # capital S + F4 D0A2 ; # capital T + F5 D0A3 ; # capital U + F6 D096 ; # capital ZH + F7 D092 ; # capital V + F8 D0AC ; # capital soft sign + F9 D0AB ; # capital Y + FA D097 ; # capital Z + FB D0A8 ; # capital SH + FC D0AD ; # capital E + FD D0A9 ; # capital SHCH + FE D0A7 ; # capital CH + FF D0AA ; # capital hard sign +} diff --git a/docker/conf/nginx/koi-win b/docker/conf/nginx/koi-win new file mode 100644 index 00000000..72afabe8 --- /dev/null +++ b/docker/conf/nginx/koi-win @@ -0,0 +1,103 @@ + +charset_map koi8-r windows-1251 { + + 80 88 ; # euro + + 95 95 ; # bullet + + 9A A0 ; #   + + 9E B7 ; # · + + A3 B8 ; # small yo + A4 BA ; # small Ukrainian ye + + A6 B3 ; # small Ukrainian i + A7 BF ; # small Ukrainian yi + + AD B4 ; # small Ukrainian soft g + AE A2 ; # small Byelorussian short u + + B0 B0 ; # ° + + B3 A8 ; # capital YO + B4 AA ; # capital Ukrainian YE + + B6 B2 ; # capital Ukrainian I + B7 AF ; # capital Ukrainian YI + + B9 B9 ; # numero sign + + BD A5 ; # capital Ukrainian soft G + BE A1 ; # capital Byelorussian short U + + BF A9 ; # (C) + + C0 FE ; # small yu + C1 E0 ; # small a + C2 E1 ; # small b + C3 F6 ; # small ts + C4 E4 ; # small d + C5 E5 ; # small ye + C6 F4 ; # small f + C7 E3 ; # small g + C8 F5 ; # small kh + C9 E8 ; # small i + CA E9 ; # small j + CB EA ; # small k + CC EB ; # small l + CD EC ; # small m + CE ED ; # small n + CF EE ; # small o + + D0 EF ; # small p + D1 FF ; # small ya + D2 F0 ; # small r + D3 F1 ; # small s + D4 F2 ; # small t + D5 F3 ; # small u + D6 E6 ; # small zh + D7 E2 ; # small v + D8 FC ; # small soft sign + D9 FB ; # small y + DA E7 ; # small z + DB F8 ; # small sh + DC FD ; # small e + DD F9 ; # small shch + DE F7 ; # small ch + DF FA ; # small hard sign + + E0 DE ; # capital YU + E1 C0 ; # capital A + E2 C1 ; # capital B + E3 D6 ; # capital TS + E4 C4 ; # capital D + E5 C5 ; # capital YE + E6 D4 ; # capital F + E7 C3 ; # capital G + E8 D5 ; # capital KH + E9 C8 ; # capital I + EA C9 ; # capital J + EB CA ; # capital K + EC CB ; # capital L + ED CC ; # capital M + EE CD ; # capital N + EF CE ; # capital O + + F0 CF ; # capital P + F1 DF ; # capital YA + F2 D0 ; # capital R + F3 D1 ; # capital S + F4 D2 ; # capital T + F5 D3 ; # capital U + F6 C6 ; # capital ZH + F7 C2 ; # capital V + F8 DC ; # capital soft sign + F9 DB ; # capital Y + FA C7 ; # capital Z + FB D8 ; # capital SH + FC DD ; # capital E + FD D9 ; # capital SHCH + FE D7 ; # capital CH + FF DA ; # capital hard sign +} diff --git a/docker/conf/nginx/mime.types b/docker/conf/nginx/mime.types new file mode 100644 index 00000000..89be9a4c --- /dev/null +++ b/docker/conf/nginx/mime.types @@ -0,0 +1,89 @@ + +types { + text/html html htm shtml; + text/css css; + text/xml xml; + image/gif gif; + image/jpeg jpeg jpg; + application/javascript js; + application/atom+xml atom; + application/rss+xml rss; + + text/mathml mml; + text/plain txt; + text/vnd.sun.j2me.app-descriptor jad; + text/vnd.wap.wml wml; + text/x-component htc; + + image/png png; + image/tiff tif tiff; + image/vnd.wap.wbmp wbmp; + image/x-icon ico; + image/x-jng jng; + image/x-ms-bmp bmp; + image/svg+xml svg svgz; + image/webp webp; + + application/font-woff woff; + application/java-archive jar war ear; + application/json json; + application/mac-binhex40 hqx; + application/msword doc; + application/pdf pdf; + application/postscript ps eps ai; + application/rtf rtf; + application/vnd.apple.mpegurl m3u8; + application/vnd.ms-excel xls; + application/vnd.ms-fontobject eot; + application/vnd.ms-powerpoint ppt; + application/vnd.wap.wmlc wmlc; + application/vnd.google-earth.kml+xml kml; + application/vnd.google-earth.kmz kmz; + application/x-7z-compressed 7z; + application/x-cocoa cco; + application/x-java-archive-diff jardiff; + application/x-java-jnlp-file jnlp; + application/x-makeself run; + application/x-perl pl pm; + application/x-pilot prc pdb; + application/x-rar-compressed rar; + application/x-redhat-package-manager rpm; + application/x-sea sea; + application/x-shockwave-flash swf; + application/x-stuffit sit; + application/x-tcl tcl tk; + application/x-x509-ca-cert der pem crt; + application/x-xpinstall xpi; + application/xhtml+xml xhtml; + application/xspf+xml xspf; + application/zip zip; + + application/octet-stream bin exe dll; + application/octet-stream deb; + application/octet-stream dmg; + application/octet-stream iso img; + application/octet-stream msi msp msm; + + application/vnd.openxmlformats-officedocument.wordprocessingml.document docx; + application/vnd.openxmlformats-officedocument.spreadsheetml.sheet xlsx; + application/vnd.openxmlformats-officedocument.presentationml.presentation pptx; + + audio/midi mid midi kar; + audio/mpeg mp3; + audio/ogg ogg; + audio/x-m4a m4a; + audio/x-realaudio ra; + + video/3gpp 3gpp 3gp; + video/mp2t ts; + video/mp4 mp4; + video/mpeg mpeg mpg; + video/quicktime mov; + video/webm webm; + video/x-flv flv; + video/x-m4v m4v; + video/x-mng mng; + video/x-ms-asf asx asf; + video/x-ms-wmv wmv; + video/x-msvideo avi; +} diff --git a/docker/conf/nginx/nginx.conf b/docker/conf/nginx/nginx.conf new file mode 100644 index 00000000..785360a0 --- /dev/null +++ b/docker/conf/nginx/nginx.conf @@ -0,0 +1,85 @@ +user www-data; +worker_processes 4; +pid /run/nginx.pid; + +events { + worker_connections 768; + # multi_accept on; +} + +http { + + ## + # Basic Settings + ## + + sendfile on; + tcp_nopush on; + tcp_nodelay on; + keepalive_timeout 65; + types_hash_max_size 2048; + # server_tokens off; + + # server_names_hash_bucket_size 64; + # server_name_in_redirect off; + + include /etc/nginx/mime.types; + default_type application/octet-stream; + + ## + # SSL Settings + ## + + ssl_protocols TLSv1 TLSv1.1 TLSv1.2; # Dropping SSLv3, ref: POODLE + ssl_prefer_server_ciphers on; + + ## + # Logging Settings + ## + + access_log /var/log/nginx/access.log; + error_log /var/log/nginx/error.log; + + ## + # Gzip Settings + ## + + gzip on; + gzip_disable "msie6"; + + # gzip_vary on; + # gzip_proxied any; + # gzip_comp_level 6; + # gzip_buffers 16 8k; + # gzip_http_version 1.1; + # gzip_types text/plain text/css application/json application/javascript text/xml application/xml application/xml+rss text/javascript; + + ## + # Virtual Host Configs + ## + + include /etc/nginx/conf.d/*.conf; + include /etc/nginx/sites-enabled/*; +} + + +#mail { +# # See sample authentication script at: +# # http://wiki.nginx.org/ImapAuthenticateWithApachePhpScript +# +# # auth_http localhost/auth.php; +# # pop3_capabilities "TOP" "USER"; +# # imap_capabilities "IMAP4rev1" "UIDPLUS"; +# +# server { +# listen localhost:110; +# protocol pop3; +# proxy on; +# } +# +# server { +# listen localhost:143; +# protocol imap; +# proxy on; +# } +#} diff --git a/docker/conf/nginx/proxy_params b/docker/conf/nginx/proxy_params new file mode 100644 index 00000000..df75bc5d --- /dev/null +++ b/docker/conf/nginx/proxy_params @@ -0,0 +1,4 @@ +proxy_set_header Host $http_host; +proxy_set_header X-Real-IP $remote_addr; +proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; +proxy_set_header X-Forwarded-Proto $scheme; diff --git a/docker/conf/nginx/scgi_params b/docker/conf/nginx/scgi_params new file mode 100644 index 00000000..47348ca3 --- /dev/null +++ b/docker/conf/nginx/scgi_params @@ -0,0 +1,16 @@ + +scgi_param REQUEST_METHOD $request_method; +scgi_param REQUEST_URI $request_uri; +scgi_param QUERY_STRING $query_string; +scgi_param CONTENT_TYPE $content_type; + +scgi_param DOCUMENT_URI $document_uri; +scgi_param DOCUMENT_ROOT $document_root; +scgi_param SCGI 1; +scgi_param SERVER_PROTOCOL $server_protocol; +scgi_param HTTPS $https if_not_empty; + +scgi_param REMOTE_ADDR $remote_addr; +scgi_param REMOTE_PORT $remote_port; +scgi_param SERVER_PORT $server_port; +scgi_param SERVER_NAME $server_name; diff --git a/docker/conf/nginx/sites-available/default b/docker/conf/nginx/sites-available/default new file mode 100644 index 00000000..94034e21 --- /dev/null +++ b/docker/conf/nginx/sites-available/default @@ -0,0 +1,22 @@ +server { + listen 80 default_server; + + root /app/web/build/; + + location /static/ { + alias /app/static/; + } + + location /media/ { + alias /app/media/; + } + + location / { + try_files $uri @django; + } + + location @django { + include uwsgi_params; + uwsgi_pass 127.0.0.1:9090; + } +} diff --git a/docker/conf/nginx/sites-enabled/default b/docker/conf/nginx/sites-enabled/default new file mode 120000 index 00000000..ad35b834 --- /dev/null +++ b/docker/conf/nginx/sites-enabled/default @@ -0,0 +1 @@ +/etc/nginx/sites-available/default \ No newline at end of file diff --git a/docker/conf/nginx/snippets/fastcgi-php.conf b/docker/conf/nginx/snippets/fastcgi-php.conf new file mode 100644 index 00000000..8f8e4a21 --- /dev/null +++ b/docker/conf/nginx/snippets/fastcgi-php.conf @@ -0,0 +1,13 @@ +# regex to split $uri to $fastcgi_script_name and $fastcgi_path +fastcgi_split_path_info ^(.+\.php)(/.+)$; + +# Check that the PHP script exists before passing it +try_files $fastcgi_script_name =404; + +# Bypass the fact that try_files resets $fastcgi_path_info +# see: http://trac.nginx.org/nginx/ticket/321 +set $path_info $fastcgi_path_info; +fastcgi_param PATH_INFO $path_info; + +fastcgi_index index.php; +include fastcgi.conf; diff --git a/docker/conf/nginx/snippets/snakeoil.conf b/docker/conf/nginx/snippets/snakeoil.conf new file mode 100644 index 00000000..ad26c3e2 --- /dev/null +++ b/docker/conf/nginx/snippets/snakeoil.conf @@ -0,0 +1,5 @@ +# Self signed certificates generated by the ssl-cert package +# Don't use them in a production server! + +ssl_certificate /etc/ssl/certs/ssl-cert-snakeoil.pem; +ssl_certificate_key /etc/ssl/private/ssl-cert-snakeoil.key; diff --git a/docker/conf/nginx/uwsgi_params b/docker/conf/nginx/uwsgi_params new file mode 100644 index 00000000..f539451b --- /dev/null +++ b/docker/conf/nginx/uwsgi_params @@ -0,0 +1,16 @@ + +uwsgi_param QUERY_STRING $query_string; +uwsgi_param REQUEST_METHOD $request_method; +uwsgi_param CONTENT_TYPE $content_type; +uwsgi_param CONTENT_LENGTH $content_length; + +uwsgi_param REQUEST_URI $request_uri; +uwsgi_param PATH_INFO $document_uri; +uwsgi_param DOCUMENT_ROOT $document_root; +uwsgi_param SERVER_PROTOCOL $server_protocol; +uwsgi_param HTTPS $https if_not_empty; + +uwsgi_param REMOTE_ADDR $remote_addr; +uwsgi_param REMOTE_PORT $remote_port; +uwsgi_param SERVER_PORT $server_port; +uwsgi_param SERVER_NAME $server_name; diff --git a/docker/conf/nginx/win-utf b/docker/conf/nginx/win-utf new file mode 100644 index 00000000..774fd9fc --- /dev/null +++ b/docker/conf/nginx/win-utf @@ -0,0 +1,125 @@ +# This map is not a full windows-1251 <> utf8 map: it does not +# contain Serbian and Macedonian letters. If you need a full map, +# use contrib/unicode2nginx/win-utf map instead. + +charset_map windows-1251 utf-8 { + + 82 E2809A; # single low-9 quotation mark + + 84 E2809E; # double low-9 quotation mark + 85 E280A6; # ellipsis + 86 E280A0; # dagger + 87 E280A1; # double dagger + 88 E282AC; # euro + 89 E280B0; # per mille + + 91 E28098; # left single quotation mark + 92 E28099; # right single quotation mark + 93 E2809C; # left double quotation mark + 94 E2809D; # right double quotation mark + 95 E280A2; # bullet + 96 E28093; # en dash + 97 E28094; # em dash + + 99 E284A2; # trade mark sign + + A0 C2A0; #   + A1 D18E; # capital Byelorussian short U + A2 D19E; # small Byelorussian short u + + A4 C2A4; # currency sign + A5 D290; # capital Ukrainian soft G + A6 C2A6; # borken bar + A7 C2A7; # section sign + A8 D081; # capital YO + A9 C2A9; # (C) + AA D084; # capital Ukrainian YE + AB C2AB; # left-pointing double angle quotation mark + AC C2AC; # not sign + AD C2AD; # soft hypen + AE C2AE; # (R) + AF D087; # capital Ukrainian YI + + B0 C2B0; # ° + B1 C2B1; # plus-minus sign + B2 D086; # capital Ukrainian I + B3 D196; # small Ukrainian i + B4 D291; # small Ukrainian soft g + B5 C2B5; # micro sign + B6 C2B6; # pilcrow sign + B7 C2B7; # · + B8 D191; # small yo + B9 E28496; # numero sign + BA D194; # small Ukrainian ye + BB C2BB; # right-pointing double angle quotation mark + + BF D197; # small Ukrainian yi + + C0 D090; # capital A + C1 D091; # capital B + C2 D092; # capital V + C3 D093; # capital G + C4 D094; # capital D + C5 D095; # capital YE + C6 D096; # capital ZH + C7 D097; # capital Z + C8 D098; # capital I + C9 D099; # capital J + CA D09A; # capital K + CB D09B; # capital L + CC D09C; # capital M + CD D09D; # capital N + CE D09E; # capital O + CF D09F; # capital P + + D0 D0A0; # capital R + D1 D0A1; # capital S + D2 D0A2; # capital T + D3 D0A3; # capital U + D4 D0A4; # capital F + D5 D0A5; # capital KH + D6 D0A6; # capital TS + D7 D0A7; # capital CH + D8 D0A8; # capital SH + D9 D0A9; # capital SHCH + DA D0AA; # capital hard sign + DB D0AB; # capital Y + DC D0AC; # capital soft sign + DD D0AD; # capital E + DE D0AE; # capital YU + DF D0AF; # capital YA + + E0 D0B0; # small a + E1 D0B1; # small b + E2 D0B2; # small v + E3 D0B3; # small g + E4 D0B4; # small d + E5 D0B5; # small ye + E6 D0B6; # small zh + E7 D0B7; # small z + E8 D0B8; # small i + E9 D0B9; # small j + EA D0BA; # small k + EB D0BB; # small l + EC D0BC; # small m + ED D0BD; # small n + EE D0BE; # small o + EF D0BF; # small p + + F0 D180; # small r + F1 D181; # small s + F2 D182; # small t + F3 D183; # small u + F4 D184; # small f + F5 D185; # small kh + F6 D186; # small ts + F7 D187; # small ch + F8 D188; # small sh + F9 D189; # small shch + FA D18A; # small hard sign + FB D18B; # small y + FC D18C; # small soft sign + FD D18D; # small e + FE D18E; # small yu + FF D18F; # small ya +} diff --git a/docker/conf/supervisor/celery.conf b/docker/conf/supervisor/celery.conf new file mode 100644 index 00000000..0257046a --- /dev/null +++ b/docker/conf/supervisor/celery.conf @@ -0,0 +1,14 @@ +[program:celery] +command=celery worker -A project -c 2 +directory=/app/ +environment=HOME="/var/www" +autostart=true +autorestart=true +user=www-data +redirect_stderr=true +stopsignal=KILL +stopasgroup=true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stdout +stderr_logfile_maxbytes=0 diff --git a/docker/conf/supervisor/celery_beat.conf b/docker/conf/supervisor/celery_beat.conf new file mode 100644 index 00000000..ec952bef --- /dev/null +++ b/docker/conf/supervisor/celery_beat.conf @@ -0,0 +1,14 @@ +[program:celery_beat] +command=celery -A project beat +directory=/app/ +environment=HOME="/var/www" +autostart=true +autorestart=true +user=www-data +redirect_stderr=true +stopsignal=KILL +stopasgroup=true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stdout +stderr_logfile_maxbytes=0 diff --git a/docker/conf/supervisor/nginx.conf b/docker/conf/supervisor/nginx.conf new file mode 100644 index 00000000..2d2679c3 --- /dev/null +++ b/docker/conf/supervisor/nginx.conf @@ -0,0 +1,10 @@ +[program:nginx] +command=nginx -g 'daemon off;' +autostart=true +autorestart=true +user=root +redirect_stderr=true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stdout +stderr_logfile_maxbytes=0 diff --git a/docker/conf/supervisor/uwsgi.conf b/docker/conf/supervisor/uwsgi.conf new file mode 100644 index 00000000..a05e29f1 --- /dev/null +++ b/docker/conf/supervisor/uwsgi.conf @@ -0,0 +1,14 @@ +[program:uwsgi] +command=uwsgi --master -p 16 --max-requests 500 --disable-logging --socket 127.0.0.1:9090 -w project.wsgi +directory=/app/ +environment=HOME="/var/www" +autostart=true +autorestart=true +user=www-data +redirect_stderr=true +stopsignal=KILL +stopasgroup=true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stdout +stderr_logfile_maxbytes=0 diff --git a/docker-compose.yml b/docker/docker-compose-dev.yml_notwork similarity index 100% rename from docker-compose.yml rename to docker/docker-compose-dev.yml_notwork diff --git a/docker/docker-compose-prod.yml b/docker/docker-compose-prod.yml new file mode 100644 index 00000000..da6b9b04 --- /dev/null +++ b/docker/docker-compose-prod.yml @@ -0,0 +1,34 @@ +version: '3' + +services: + db: + image: postgres:10.3-alpine + restart: always + env_file: + - .env + volumes: + - ./data/postgres:/var/lib/postgresql/data + + redis: + image: redis:4.0.9-alpine + restart: always + ports: + - "127.0.0.1:6379:6379" + volumes: + - ./data/redis:/data + + app: + build: + context: ../ + dockerfile: docker/Dockerfile + restart: always + env_file: + - .env + ports: + - "${PORT}:80" + depends_on: + - db + - redis + links: + - db + - redis diff --git a/docker/entrypoint_app.sh b/docker/entrypoint_app.sh new file mode 100755 index 00000000..826abef0 --- /dev/null +++ b/docker/entrypoint_app.sh @@ -0,0 +1,5 @@ +#!/bin/sh +cd /app +python manage.py migrate +python manage.py loaddata /app/apps/*/fixtures/*.json +python2.7 /usr/bin/supervisord -n