Merge 012cd269d7
into 6024b7bdf3
This commit is contained in:
commit
99c4fd6bc6
3 changed files with 11 additions and 11 deletions
10
Dockerfile
10
Dockerfile
|
@ -13,15 +13,15 @@ RUN echo "daemon off;" >> /etc/nginx/nginx.conf
|
|||
#fix for long server names
|
||||
RUN sed -i 's/# server_names_hash_bucket/server_names_hash_bucket/g' /etc/nginx/nginx.conf
|
||||
|
||||
RUN mkdir /app
|
||||
WORKDIR /app
|
||||
ADD . /app
|
||||
|
||||
RUN wget -P /usr/local/bin https://godist.herokuapp.com/projects/ddollar/forego/releases/current/linux-amd64/forego
|
||||
RUN chmod u+x /usr/local/bin/forego
|
||||
|
||||
RUN wget https://github.com/jwilder/docker-gen/releases/download/0.3.2/docker-gen-linux-amd64-0.3.2.tar.gz
|
||||
RUN tar xvzf docker-gen-linux-amd64-0.3.2.tar.gz
|
||||
RUN tar -C /usr/local/bin -xvzf docker-gen-linux-amd64-0.3.2.tar.gz
|
||||
|
||||
RUN mkdir /app
|
||||
WORKDIR /app
|
||||
ADD . /app
|
||||
|
||||
EXPOSE 80
|
||||
ENV DOCKER_HOST unix:///tmp/docker.sock
|
||||
|
|
2
Procfile
2
Procfile
|
@ -1,2 +1,2 @@
|
|||
nginx: nginx
|
||||
dockergen: /app/docker-gen -watch -only-exposed -notify "nginx -s reload" /app/nginx.tmpl /etc/nginx/sites-enabled/default
|
||||
dockergen: docker-gen -watch -only-exposed -notify "nginx -s reload" /app/nginx.tmpl /etc/nginx/sites-enabled/default
|
||||
|
|
10
nginx.tmpl
10
nginx.tmpl
|
@ -49,12 +49,12 @@ server {
|
|||
access_log /proc/self/fd/1;
|
||||
|
||||
location / {
|
||||
proxy_pass http://{{ $host }};
|
||||
include /etc/nginx/proxy_params;
|
||||
proxy_set_header X-Real-IP $remote_addr;
|
||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||
proxy_set_header Host $http_host;
|
||||
proxy_redirect false;
|
||||
|
||||
# HTTP 1.1 support
|
||||
proxy_http_version 1.1;
|
||||
proxy_set_header Connection "";
|
||||
proxy_pass http://{{ $host }};
|
||||
}
|
||||
}
|
||||
{{ end }}
|
||||
|
|
Loading…
Reference in a new issue