verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 57 Releases Wiki Activity

Services Jenkins

This commit is contained in:
Vicente Falco 2018-02-09 12:26:27 +01:00
parent 6af6ca9c34
commit 58d5e7add9
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
services/nginx/Dockerfile
View File

@ -6,10 +6,8 @@ RUN rm /etc/nginx/conf.d/default.conf
COPY temp/nginx.conf /etc/nginx/nginx.conf COPY temp/nginx.conf /etc/nginx/nginx.conf
COPY static /usr/share/nginx/html COPY static /usr/share/nginx/html
RUN apt-get update && apt-get -y install vim dnsmasq dnsutils RUN apt-get update && apt-get -y install vim dnsmasq dnsutils iptools-ping
RUN rm -fr /usr/share/dns RUN rm -fr /usr/share/dns
RUN echo listen-address=127.0.0.1 > /etc/dnsmasq.d/dnsmasq.conf RUN echo listen-address=127.0.0.1 > /etc/dnsmasq.d/dnsmasq.conf
CMD service dnsmasq restart && nginx -g "daemon off;" CMD service dnsmasq restart && nginx -g "daemon off;"
EXPOSE 80

2
services/nginx/nginx.mst
View File

@ -21,7 +21,7 @@ http {
{{#services}} {{#services}}
location ~ ^/{{name}}(?:/(.*))?$ { location ~ ^/{{name}}(?:/(.*))?$ {
proxy_pass http://{{name}}:{{port}}/$1$is_args$args; proxy_pass http://{{name}}:{{defaultPort}}/$1$is_args$args;
} }
{{/services}} {{/services}}