From f166f1daf7a1aa489242e870ef65b35d6ec8f5e6 Mon Sep 17 00:00:00 2001
From: Vladimir Kravchenko <volandevovan@yandex.ru>
Date: Fri, 25 Sep 2020 16:13:55 +0300
Subject: [PATCH 01/11] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8?=
 =?UTF-8?q?=D0=BB=20Dockerfile?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Dockerfile | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 Dockerfile

diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..faf637e
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,21 @@
+FROM golang:1.14-alpine as build
+
+WORKDIR /go/src/github.com/xtrafrancyz/vk-proxy/
+
+COPY . .
+
+RUN go install && go build
+
+FROM alpine:3.12
+
+EXPOSE 8080
+
+ENV PORT 8080
+ENV DOMAIN vk-api-proxy.example.com
+ENV STATIC_DOMAIN vk-static-proxy.example.com
+
+WORKDIR /app
+
+COPY --from=build /go/src/github.com/xtrafrancyz/vk-proxy/vk-proxy/ /app/vk-proxy
+
+ENTRYPOINT ["/bin/sh", "-c", "/app/vk-proxy -allowMissingConfig -bind 0.0.0.0:$PORT -domain $DOMAIN -domain-static $STATIC_DOMAIN" ]

From 769f5ef24be6514b6275e1a980068211924951a6 Mon Sep 17 00:00:00 2001
From: Vladimir Kravchenko <volandevovan@yandex.ru>
Date: Fri, 25 Sep 2020 16:50:30 +0300
Subject: [PATCH 02/11] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8?=
 =?UTF-8?q?=D0=BB=20=D0=BA=D0=BE=D0=BD=D1=82=D0=B5=D0=B9=D0=BD=D0=B5=D1=80?=
 =?UTF-8?q?=20=D1=81=20nginx=20=D0=B8=20docker-compose=20=D1=84=D0=B0?=
 =?UTF-8?q?=D0=B9=D0=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .docker/nginx/Dockerfile |  15 +++++
 .docker/nginx/nginx.conf | 137 +++++++++++++++++++++++++++++++++++++++
 docker-compose.yml       |  20 ++++++
 3 files changed, 172 insertions(+)
 create mode 100644 .docker/nginx/Dockerfile
 create mode 100644 .docker/nginx/nginx.conf
 create mode 100644 docker-compose.yml

diff --git a/.docker/nginx/Dockerfile b/.docker/nginx/Dockerfile
new file mode 100644
index 0000000..0b0a017
--- /dev/null
+++ b/.docker/nginx/Dockerfile
@@ -0,0 +1,15 @@
+FROM nginx:1.19.2-alpine
+
+EXPOSE 8080
+
+ENV PORT 8080
+ENV DOMAIN vk-api-proxy.example.com
+ENV STATIC_DOMAIN vk-static-proxy.example.com
+ENV VK_PROXY_HOST vk-proxy
+
+COPY nginx.conf /etc/nginx/nginx.conf
+
+RUN sed -i 's/80/'"$PORT"'/g' /etc/nginx/nginx.conf && \
+    sed -i 's/127.0.0.1:8881/'"$VK_PROXY_HOST"'/g' /etc/nginx/nginx.conf && \
+    sed -i 's/vk-api-proxy.example.com/'"$DOMAIN"'/g' /etc/nginx/nginx.conf && \
+    sed -i 's/vk-static-proxy.example.com/'"$STATIC_DOMAIN"'/g' /etc/nginx/nginx.conf
diff --git a/.docker/nginx/nginx.conf b/.docker/nginx/nginx.conf
new file mode 100644
index 0000000..bcd98fe
--- /dev/null
+++ b/.docker/nginx/nginx.conf
@@ -0,0 +1,137 @@
+user nginx;
+worker_processes 1;
+
+pid /var/run/nginx.pid;
+
+events {
+	worker_connections 1024;
+}
+
+http {
+	sendfile on;
+	tcp_nopush on;
+	tcp_nodelay on;
+	keepalive_timeout 65;
+	types_hash_max_size 2048;
+
+	client_max_body_size 10M;
+	server_names_hash_bucket_size 64;
+
+	include /etc/nginx/mime.types;
+	default_type application/octet-stream;
+
+	access_log off;
+	error_log /var/log/nginx/error.log crit;
+
+	gzip on;
+	gzip_disable "msie6";
+
+	gzip_vary on;
+	gzip_min_length 500;
+	gzip_buffers 16 8k;
+	gzip_types text/plain text/css application/json application/x-javascript text/xml application/xml application/xml+rss text/javascript;
+
+	upstream vk-proxy {
+		server 127.0.0.1:8881;
+		keepalive 64;
+	}
+
+	map $request_method $cors_origin {
+		default "*";
+		"OPTIONS" $http_access_control_allow_origin;
+	}
+
+	server {
+		listen 80;
+		listen [::]:80;
+
+		server_name vk-api-proxy.example.com;
+		charset UTF-8;
+
+		# Нужен для динамических доменов в proxy_pass
+		resolver 8.8.8.8;
+
+		# Если вы используете Let's Encrypt, то в файлике ssl-snippet.conf лежат рекомендуемые настройки SSL
+		#include ssl-snippet.conf
+
+		proxy_buffering on;
+		proxy_request_buffering off;
+		proxy_max_temp_file_size 0;
+
+		location /_ {
+			location /_ {
+				return 403;
+			}
+
+			location ~ ^/_/(?:vk\.com|(?:[-_a-zA-Z0-9]+)\.(?:userapi\.com|vk-cdn\.net|vk\.(?:me|com)|vkuser(?:live|video|audio)\.(?:net|com)))/ {
+				rewrite /_/([^/]+)/(.*) /$2 break;
+
+				client_max_body_size 128m;
+				proxy_set_header X-Real-IP $remote_addr;
+				proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+				proxy_pass https://$1;
+
+				# Переадресация локальных ссылок
+				# $1 берется из регекспа rewrite
+				proxy_redirect / /_/$1/;
+
+				# Переадресация абсолютных ссылок
+				proxy_redirect ~^https?://(.*) /_/$1;
+			}
+		}
+
+		location / {
+			gzip_proxied any;
+			proxy_set_header X-Real-IP $remote_addr;
+			proxy_set_header Host $host;
+			proxy_pass http://vk-proxy;
+			add_header Access-Control-Allow-Origin $cors_origin;
+		}
+	}
+
+	server {
+		listen 80;
+		listen [::]:80;
+
+		server_name vk-static-proxy.example.com;
+		charset UTF-8;
+
+		#include ssl-snippet.conf
+
+		proxy_buffering on;
+		proxy_request_buffering off;
+		proxy_max_temp_file_size 0;
+
+		location ~* ^.+\.(jpeg|gif|png|jpg|ico|otf|woff|ttf|woff2|svg) {
+			proxy_pass https://static.vk.com;
+			proxy_redirect https://static.vk.com/ /;
+		}
+
+		location / {
+			proxy_set_header X-Real-IP $remote_addr;
+			proxy_set_header Proxy-Host static.vk.com;
+			proxy_pass http://vk-proxy;
+		}
+	}
+
+	server {
+		listen 80;
+		listen [::]:80;
+
+		server_name vk-oauth-proxy.example.com;
+		charset UTF-8;
+
+		#include ssl-snippet.conf
+
+		proxy_buffering on;
+		proxy_request_buffering off;
+		proxy_max_temp_file_size 0;
+
+		location / {
+			proxy_set_header X-Real-IP $remote_addr;
+			proxy_set_header Proxy-Host oauth.vk.com;
+			proxy_pass http://vk-proxy;
+			proxy_redirect https://oauth.vk.com/ /;
+		}
+	}
+}
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 0000000..660cc39
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,20 @@
+version: '2'
+
+
+services:
+  nginx:
+    image: vk-proxy-nginx
+    build: .docker/nginx
+    environment:
+      - VK_PROXY_HOST=vk-proxy
+      - DOMAIN=...
+      - STATIC_DOMAIN=...
+    ports:
+      - 8080:8080
+  
+  vk-proxy:
+    image: vk-proxy
+    build: .
+    environment:
+      - DOMAIN=...
+      - STATIC_DOMAIN=...
\ No newline at end of file

From ffbbf36a3f49f4a62e82f92e3ceb0471e297cb74 Mon Sep 17 00:00:00 2001
From: Vladimir Kravchenko <volandevovan@yandex.ru>
Date: Fri, 25 Sep 2020 17:00:57 +0300
Subject: [PATCH 03/11] =?UTF-8?q?=D0=9F=D0=BE=D0=B4=D1=81=D1=82=D0=B0?=
 =?UTF-8?q?=D0=B2=D0=BB=D1=8F=D1=8E=20=D0=BF=D0=B5=D1=80=D0=B5=D0=BC=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=BD=D1=8B=D0=B5=20=D0=BF=D1=80=D0=B8=20=D0=B7=D0=B0?=
 =?UTF-8?q?=D0=BF=D1=83=D1=81=D0=BA=D0=B5=20=D0=BA=D0=BE=D0=BD=D1=82=D0=B5?=
 =?UTF-8?q?=D0=B9=D0=BD=D0=B5=D1=80=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .docker/nginx/Dockerfile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.docker/nginx/Dockerfile b/.docker/nginx/Dockerfile
index 0b0a017..c2fca5f 100644
--- a/.docker/nginx/Dockerfile
+++ b/.docker/nginx/Dockerfile
@@ -9,7 +9,8 @@ ENV VK_PROXY_HOST vk-proxy
 
 COPY nginx.conf /etc/nginx/nginx.conf
 
-RUN sed -i 's/80/'"$PORT"'/g' /etc/nginx/nginx.conf && \
+CMD sed -i 's/80/'"$PORT"'/g' /etc/nginx/nginx.conf && \
     sed -i 's/127.0.0.1:8881/'"$VK_PROXY_HOST"'/g' /etc/nginx/nginx.conf && \
     sed -i 's/vk-api-proxy.example.com/'"$DOMAIN"'/g' /etc/nginx/nginx.conf && \
-    sed -i 's/vk-static-proxy.example.com/'"$STATIC_DOMAIN"'/g' /etc/nginx/nginx.conf
+    sed -i 's/vk-static-proxy.example.com/'"$STATIC_DOMAIN"'/g' /etc/nginx/nginx.conf && \
+    nginx -g daemon off;
\ No newline at end of file

From 38040676168e808c753b3c56dae9e7465c0c449b Mon Sep 17 00:00:00 2001
From: Vladimir Kravchenko <volandevovan@yandex.ru>
Date: Fri, 25 Sep 2020 17:07:25 +0300
Subject: [PATCH 04/11] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=B8=D0=BB=20=D0=B7=D0=B0=D0=BF=D1=83=D1=81=D0=BA=20=D0=BF?=
 =?UTF-8?q?=D0=BE=D1=81=D0=BB=D0=B5=20=D0=BF=D1=80=D0=B8=D0=BC=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=BF=D0=B5=D1=80=D0=B5=D0=BC=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=BD=D1=8B=D1=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .docker/nginx/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.docker/nginx/Dockerfile b/.docker/nginx/Dockerfile
index c2fca5f..3b25358 100644
--- a/.docker/nginx/Dockerfile
+++ b/.docker/nginx/Dockerfile
@@ -13,4 +13,4 @@ CMD sed -i 's/80/'"$PORT"'/g' /etc/nginx/nginx.conf && \
     sed -i 's/127.0.0.1:8881/'"$VK_PROXY_HOST"'/g' /etc/nginx/nginx.conf && \
     sed -i 's/vk-api-proxy.example.com/'"$DOMAIN"'/g' /etc/nginx/nginx.conf && \
     sed -i 's/vk-static-proxy.example.com/'"$STATIC_DOMAIN"'/g' /etc/nginx/nginx.conf && \
-    nginx -g daemon off;
\ No newline at end of file
+    nginx -g "daemon off;"
\ No newline at end of file

From 4a91819785dd298d57900c9b53ee737be068170d Mon Sep 17 00:00:00 2001
From: Vladimir Kravchenko <volandevovan@yandex.ru>
Date: Fri, 25 Sep 2020 17:29:14 +0300
Subject: [PATCH 05/11] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D0=B4=D0=B5?=
 =?UTF-8?q?=D0=BB=D0=B0=D0=BB=20=D0=BD=D0=B0=20envsubst?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .docker/nginx/Dockerfile    | 17 ++++++++++-------
 .docker/nginx/entrypoint.sh | 14 ++++++++++++++
 .docker/nginx/nginx.conf    | 14 +++++++-------
 3 files changed, 31 insertions(+), 14 deletions(-)
 create mode 100755 .docker/nginx/entrypoint.sh

diff --git a/.docker/nginx/Dockerfile b/.docker/nginx/Dockerfile
index 3b25358..d44df39 100644
--- a/.docker/nginx/Dockerfile
+++ b/.docker/nginx/Dockerfile
@@ -3,14 +3,17 @@ FROM nginx:1.19.2-alpine
 EXPOSE 8080
 
 ENV PORT 8080
-ENV DOMAIN vk-api-proxy.example.com
+
+ENV API_DOMAIN vk-api-proxy.example.com
 ENV STATIC_DOMAIN vk-static-proxy.example.com
+
 ENV VK_PROXY_HOST vk-proxy
+ENV VK_PROXY_PORT 8080
+
+
+COPY ./entrypoint.sh /entrypoint.sh
 
-COPY nginx.conf /etc/nginx/nginx.conf
+COPY nginx.conf /tmp/nginx.conf
 
-CMD sed -i 's/80/'"$PORT"'/g' /etc/nginx/nginx.conf && \
-    sed -i 's/127.0.0.1:8881/'"$VK_PROXY_HOST"'/g' /etc/nginx/nginx.conf && \
-    sed -i 's/vk-api-proxy.example.com/'"$DOMAIN"'/g' /etc/nginx/nginx.conf && \
-    sed -i 's/vk-static-proxy.example.com/'"$STATIC_DOMAIN"'/g' /etc/nginx/nginx.conf && \
-    nginx -g "daemon off;"
\ No newline at end of file
+ENTRYPOINT [ "/entrypoint.sh" ]
+CMD nginx -g "daemon off;"
\ No newline at end of file
diff --git a/.docker/nginx/entrypoint.sh b/.docker/nginx/entrypoint.sh
new file mode 100755
index 0000000..6605c15
--- /dev/null
+++ b/.docker/nginx/entrypoint.sh
@@ -0,0 +1,14 @@
+#!/bin/ash
+envsubst < /tmp/nginx.conf > /etc/nginx/nginx.conf
+
+Check for vk proxy up before starting the nginx
+echo "Checking vk proxy status."
+until nc -z -v -w30 $VK_PROXY_HOST $VK_PROXY_PORT
+do
+  echo "Waiting for vk proxy connection..."
+  # wait for 5 seconds before check again
+  sleep 5
+done
+
+echo Startup command: $@
+exec "$@"
\ No newline at end of file
diff --git a/.docker/nginx/nginx.conf b/.docker/nginx/nginx.conf
index bcd98fe..292ac02 100644
--- a/.docker/nginx/nginx.conf
+++ b/.docker/nginx/nginx.conf
@@ -32,7 +32,7 @@ http {
 	gzip_types text/plain text/css application/json application/x-javascript text/xml application/xml application/xml+rss text/javascript;
 
 	upstream vk-proxy {
-		server 127.0.0.1:8881;
+		server ${VK_PROXY_HOST}:${VK_PROXY_PORT};
 		keepalive 64;
 	}
 
@@ -42,10 +42,10 @@ http {
 	}
 
 	server {
-		listen 80;
-		listen [::]:80;
+		listen ${PORT};
+		listen [::]:${PORT};
 
-		server_name vk-api-proxy.example.com;
+		server_name ${API_DOMAIN};
 		charset UTF-8;
 
 		# Нужен для динамических доменов в proxy_pass
@@ -90,10 +90,10 @@ http {
 	}
 
 	server {
-		listen 80;
-		listen [::]:80;
+		listen ${PORT};
+		listen [::]:${PORT};
 
-		server_name vk-static-proxy.example.com;
+		server_name ${STATIC_DOMAIN};
 		charset UTF-8;
 
 		#include ssl-snippet.conf

From 097db8dd1e49ccd91d7b5fb67ca6a6eb0c303ee4 Mon Sep 17 00:00:00 2001
From: Vladimir Kravchenko <volandevovan@yandex.ru>
Date: Fri, 25 Sep 2020 17:38:20 +0300
Subject: [PATCH 06/11] =?UTF-8?q?=D0=97=D0=B0=D0=BC=D0=B5=D0=BD=D0=B0=20?=
 =?UTF-8?q?=D1=82=D0=BE=D0=BB=D1=8C=D0=BA=D0=BE=20=D1=83=D0=BA=D0=B0=D0=B7?=
 =?UTF-8?q?=D0=B0=D0=BD=D0=BD=D1=8B=D1=85=20=D0=BF=D0=B5=D1=80=D0=B5=D0=BC?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=BD=D1=8B=D1=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .docker/nginx/entrypoint.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.docker/nginx/entrypoint.sh b/.docker/nginx/entrypoint.sh
index 6605c15..429bafa 100755
--- a/.docker/nginx/entrypoint.sh
+++ b/.docker/nginx/entrypoint.sh
@@ -1,7 +1,9 @@
 #!/bin/ash
-envsubst < /tmp/nginx.conf > /etc/nginx/nginx.conf
+set -e 
 
-Check for vk proxy up before starting the nginx
+envsubst "\$PORT \$API_DOMAIN \$STATIC_DOMAIN \$VK_PROXY_HOST \$VK_PROXY_PORT" < /tmp/nginx.conf > /etc/nginx/nginx.conf
+
+echo Check for vk proxy up before starting the nginx
 echo "Checking vk proxy status."
 until nc -z -v -w30 $VK_PROXY_HOST $VK_PROXY_PORT
 do

From 3e6d859aa30a65b664f594760e119dd7b38f8a56 Mon Sep 17 00:00:00 2001
From: Vladimir Kravchenko <volandevovan@yandex.ru>
Date: Fri, 25 Sep 2020 17:52:00 +0300
Subject: [PATCH 07/11] =?UTF-8?q?=D0=92=D0=BA=D0=BB=D1=8E=D1=87=D0=B8?=
 =?UTF-8?q?=D0=BB=20=D0=B4=D0=B5=D0=B1=D0=B0=D0=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Dockerfile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index faf637e..19581ca 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -11,11 +11,12 @@ FROM alpine:3.12
 EXPOSE 8080
 
 ENV PORT 8080
-ENV DOMAIN vk-api-proxy.example.com
+ENV API_DOMAIN vk-api-proxy.example.com
 ENV STATIC_DOMAIN vk-static-proxy.example.com
 
 WORKDIR /app
 
 COPY --from=build /go/src/github.com/xtrafrancyz/vk-proxy/vk-proxy/ /app/vk-proxy
 
-ENTRYPOINT ["/bin/sh", "-c", "/app/vk-proxy -allowMissingConfig -bind 0.0.0.0:$PORT -domain $DOMAIN -domain-static $STATIC_DOMAIN" ]
+# TODO: Нормальный запуск из под entrypoint'a 
+ENTRYPOINT ["/bin/sh", "-c", "/app/vk-proxy -allowMissingConfig -bind 0.0.0.0:$PORT -domain $DOMAIN -domain-static $STATIC_DOMAIN" "-log-verbosity", "3" ]

From ba1273ec2edb21710b7b59d79a4b47f73fd7338f Mon Sep 17 00:00:00 2001
From: Vladimir Kravchenko <volandevovan@yandex.ru>
Date: Fri, 25 Sep 2020 17:54:13 +0300
Subject: [PATCH 08/11] UP

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 19581ca..c4ea69d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -19,4 +19,4 @@ WORKDIR /app
 COPY --from=build /go/src/github.com/xtrafrancyz/vk-proxy/vk-proxy/ /app/vk-proxy
 
 # TODO: Нормальный запуск из под entrypoint'a 
-ENTRYPOINT ["/bin/sh", "-c", "/app/vk-proxy -allowMissingConfig -bind 0.0.0.0:$PORT -domain $DOMAIN -domain-static $STATIC_DOMAIN" "-log-verbosity", "3" ]
+ENTRYPOINT ["/bin/sh", "-c", "/app/vk-proxy -allowMissingConfig -bind 0.0.0.0:$PORT -domain $DOMAIN -domain-static $STATIC_DOMAIN", "-log-verbosity", "3" ]

From 05bac9cc87498fb0d4251f5d06809c31ad3673f2 Mon Sep 17 00:00:00 2001
From: Vladimir Kravchenko <volandevovan@yandex.ru>
Date: Fri, 25 Sep 2020 18:20:08 +0300
Subject: [PATCH 09/11] =?UTF-8?q?=D0=92=D1=8B=D0=BD=D0=B5=D1=81=20=D0=B2?=
 =?UTF-8?q?=20=D0=BE=D1=82=D0=B4=D0=B5=D0=BB=D1=8C=D0=BD=D1=8B=D0=B9=20?=
 =?UTF-8?q?=D1=84=D0=B0=D0=B9=D0=BB=20=D1=82=D0=BE=D1=87=D0=BA=D1=83=20?=
 =?UTF-8?q?=D0=B2=D1=85=D0=BE=D0=B4=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .docker/vk-proxy/entrypoint.sh | 9 +++++++++
 .gitignore                     | 2 +-
 Dockerfile                     | 4 ++--
 3 files changed, 12 insertions(+), 3 deletions(-)
 create mode 100755 .docker/vk-proxy/entrypoint.sh

diff --git a/.docker/vk-proxy/entrypoint.sh b/.docker/vk-proxy/entrypoint.sh
new file mode 100755
index 0000000..4ed460a
--- /dev/null
+++ b/.docker/vk-proxy/entrypoint.sh
@@ -0,0 +1,9 @@
+#!/bin/ash
+
+set -e 
+
+/app/vk-proxy -allowMissingConfig \
+    -bind 0.0.0.0:$PORT \
+    -domain $API_DOMAIN \
+    -domain-static $STATIC_DOMAIN \
+    -log-verbosity 3
diff --git a/.gitignore b/.gitignore
index f7d4735..681d86c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,4 +6,4 @@
 *.dylib
 *.test
 
-vk-proxy
+/vk-proxy
diff --git a/Dockerfile b/Dockerfile
index c4ea69d..6a022a7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,6 +17,6 @@ ENV STATIC_DOMAIN vk-static-proxy.example.com
 WORKDIR /app
 
 COPY --from=build /go/src/github.com/xtrafrancyz/vk-proxy/vk-proxy/ /app/vk-proxy
+COPY .docker/vk-proxy/entrypoint.sh /entrypoint.sh
 
-# TODO: Нормальный запуск из под entrypoint'a 
-ENTRYPOINT ["/bin/sh", "-c", "/app/vk-proxy -allowMissingConfig -bind 0.0.0.0:$PORT -domain $DOMAIN -domain-static $STATIC_DOMAIN", "-log-verbosity", "3" ]
+ENTRYPOINT [ "/entrypoint.sh" ]
\ No newline at end of file

From ab91afbb926e72f91b45ef3bcbde5d2ddfdb1c15 Mon Sep 17 00:00:00 2001
From: Vladimir Kravchenko <volandevovan@yandex.ru>
Date: Fri, 25 Sep 2020 18:34:41 +0300
Subject: [PATCH 10/11] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8?=
 =?UTF-8?q?=D0=BB=20oauth=20=D0=B4=D0=BE=D0=BC=D0=B5=D0=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .docker/nginx/Dockerfile | 1 +
 .docker/nginx/nginx.conf | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.docker/nginx/Dockerfile b/.docker/nginx/Dockerfile
index d44df39..eeb46e0 100644
--- a/.docker/nginx/Dockerfile
+++ b/.docker/nginx/Dockerfile
@@ -6,6 +6,7 @@ ENV PORT 8080
 
 ENV API_DOMAIN vk-api-proxy.example.com
 ENV STATIC_DOMAIN vk-static-proxy.example.com
+ENV OAUTH_DOMAIN vk-oauth-proxy.example.com
 
 ENV VK_PROXY_HOST vk-proxy
 ENV VK_PROXY_PORT 8080
diff --git a/.docker/nginx/nginx.conf b/.docker/nginx/nginx.conf
index 292ac02..0cb8728 100644
--- a/.docker/nginx/nginx.conf
+++ b/.docker/nginx/nginx.conf
@@ -118,7 +118,7 @@ http {
 		listen 80;
 		listen [::]:80;
 
-		server_name vk-oauth-proxy.example.com;
+		server_name ${OAUTH_DOMAIN};
 		charset UTF-8;
 
 		#include ssl-snippet.conf

From 5f1971949a94b74f1b21db9a27cd25b8d68c42c8 Mon Sep 17 00:00:00 2001
From: Vladimir Kravchenko <volandevovan@yandex.ru>
Date: Fri, 25 Sep 2020 18:46:38 +0300
Subject: [PATCH 11/11] =?UTF-8?q?=D0=92=D0=BA=D0=BB=D1=8E=D1=87=D0=B8?=
 =?UTF-8?q?=D0=BB=20OAUTH=20=D0=B4=D0=BE=D0=BC=D0=B5=D0=BD=20=D0=B2=20?=
 =?UTF-8?q?=D0=BE=D0=B1=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=BA=D1=83=20=D1=81?=
 =?UTF-8?q?=D0=BA=D1=80=D0=B8=D0=BF=D1=82=D0=BE=D0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .docker/nginx/entrypoint.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.docker/nginx/entrypoint.sh b/.docker/nginx/entrypoint.sh
index 429bafa..7c7b3b6 100755
--- a/.docker/nginx/entrypoint.sh
+++ b/.docker/nginx/entrypoint.sh
@@ -1,7 +1,7 @@
 #!/bin/ash
 set -e 
 
-envsubst "\$PORT \$API_DOMAIN \$STATIC_DOMAIN \$VK_PROXY_HOST \$VK_PROXY_PORT" < /tmp/nginx.conf > /etc/nginx/nginx.conf
+envsubst "\$PORT \$API_DOMAIN \$STATIC_DOMAIN \$OAUTH_DOMAIN \$VK_PROXY_HOST \$VK_PROXY_PORT" < /tmp/nginx.conf > /etc/nginx/nginx.conf
 
 echo Check for vk proxy up before starting the nginx
 echo "Checking vk proxy status."