some refactor in docer-compose and Docker- add nginx from source

.dockerignore

@@ -1,8 +1,9 @@
-env
-compose
-public
-node_modules
-bower_components
-tmp_emails
-tmp
-var
+/env
+/compose
+/public
+/node_modules
+/bower_components
+/tmp_emails
+/tmp
+/var
+/db

.gitignore

@@ -18,6 +18,7 @@ yandex_money.log
 /src/dokumentor/media/
 /tmp/
 /data/
+/db/
 /public/
 conf/env
 !local.py

Dockerfile

@@ -1,22 +1,58 @@
 FROM python:3.6
 ENV PYTHONUNBUFFERED 1
+
+ENV NGINX_VERSION="1.12.0" \
+    NGINX_OPTS="--with-http_ssl_module \
+                --with-http_gzip_static_module \
+                --prefix=/usr/share/nginx \
+                --sbin-path=/usr/sbin/nginx \
+                --conf-path=/etc/nginx/nginx.conf \
+                --pid-path=/var/run/nginx.pid \
+                --http-log-path=/var/log/nginx/access.log \
+                --error-log-path=/var/log/nginx/error.log \
+                --user=www-data \
+                --group=www-data \
+                --add-module=/tmp/modules/nginx_requestid-master"
+
 COPY requirements /opt/app/requirements
 RUN apt-get update -y && \
     apt-get upgrade -y && \
-    apt-get -y install ghostscript libfreetype6-dev python3-dev nginx supervisor make && \
+    apt-get -y install ghostscript \
+    libfreetype6-dev \
+    python3-dev \
+    supervisor \
+    make && \
     apt-get clean && \
-    rm -rf /var/lib/apt/lists/* && \
+
+    # Download additional nginx modules
+    mkdir -p /tmp/modules && \
+    cd /tmp/modules && \
+    wget -O nginx-requestid.tar.gz https://github.com/hhru/nginx_requestid/archive/master.tar.gz && \
+    tar xvzf nginx-requestid.tar.gz && \
+    # Download and compile nginx
+    cd /tmp && \
+    wget http://nginx.org/download/nginx-${NGINX_VERSION}.tar.gz && \
+    tar xzvf nginx-${NGINX_VERSION}.tar.gz && \
+    cd nginx-${NGINX_VERSION} && \
+    ./configure ${NGINX_OPTS} && \
+    make && \
+    make install && \
 
     pip install --upgrade pip && \
     pip install --no-cache-dir  -r /opt/app/requirements/production.txt && \
 
-    # Nginx
-
-    chown -R www-data:www-data /var/lib/nginx && \
-
     # Delete build dependencies after use
-    rm -r /root/.cache
+    cd /tmp \
+
+    && rm -rf \
+        modules \
+        nginx-${NGINX_VERSION} \
+        nginx-${NGINX_VERSION}.tar.gz \
+        /var/cache/apt/* \
+        /root/.cache \
+        /var/lib/apt/lists/*
 
+# for gitlab cli
 COPY . /opt/app
 VOLUME ["/opt/app/public/media"]
 WORKDIR /opt/app

conf/docker/entrypoint_stage.sh

@@ -11,7 +11,7 @@ python src/manage.py collectstatic --noinput
 
 # Make database migrations
 echo "Make database migrations"
-python src/manage.py     makemigrations
+python src/manage.py makemigrations
 
 # Apply database migrations
 echo "Apply database migrations"

db/PG_VERSION

@@ -0,0 +1 @@
+9.6