From 58d5e7add9073fb622a6f3160e47c64401667f2a Mon Sep 17 00:00:00 2001 From: Vicente Falco Date: Fri, 9 Feb 2018 12:26:27 +0100 Subject: [PATCH] Services Jenkins --- services/nginx/Dockerfile | 4 +--- services/nginx/nginx.mst | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/services/nginx/Dockerfile b/services/nginx/Dockerfile index 414b3a7ef..9afbcf1e7 100644 --- a/services/nginx/Dockerfile +++ b/services/nginx/Dockerfile @@ -6,10 +6,8 @@ RUN rm /etc/nginx/conf.d/default.conf COPY temp/nginx.conf /etc/nginx/nginx.conf 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 echo listen-address=127.0.0.1 > /etc/dnsmasq.d/dnsmasq.conf CMD service dnsmasq restart && nginx -g "daemon off;" - -EXPOSE 80 \ No newline at end of file diff --git a/services/nginx/nginx.mst b/services/nginx/nginx.mst index 146fd25d8..ed08ae691 100644 --- a/services/nginx/nginx.mst +++ b/services/nginx/nginx.mst @@ -21,7 +21,7 @@ http { {{#services}} location ~ ^/{{name}}(?:/(.*))?$ { - proxy_pass http://{{name}}:{{port}}/$1$is_args$args; + proxy_pass http://{{name}}:{{defaultPort}}/$1$is_args$args; } {{/services}}