From 77d8a8f0907b4587c4df1143cc10869f659245e3 Mon Sep 17 00:00:00 2001 From: Vicente Falco Date: Mon, 15 May 2017 08:33:51 +0200 Subject: [PATCH] Jenkins --- Jenkinsfile | 2 +- services/nginx/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 15a019eb4..7cecefe16 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -7,7 +7,7 @@ def branchName = "${env.BRANCH_NAME}"; def branchNameTest = "preprod"; def branchNameProd = "master"; def prefixDocker = "test"; -def dockerNginxName = ["nginx", "-p 80:8080 --cap-add NET_ADMIN --link test-auth:auth --link test-salix:salix --link test-client:client"] +def dockerNginxName = ["nginx", "-p 80:8080 --privileged --link test-auth:auth --link test-salix:salix --link test-client:client"] def dockerAuthName = ["auth", "-p 3000:3000"] def dockerSalixName = ["salix", "-p 3001:3001"] def dockerClientName = ["client", "-p 3002:3002"] diff --git a/services/nginx/Dockerfile b/services/nginx/Dockerfile index ad45cd083..1ce39be8e 100644 --- a/services/nginx/Dockerfile +++ b/services/nginx/Dockerfile @@ -8,7 +8,7 @@ COPY conf-prod.conf /etc/nginx/nginx.conf COPY static /usr/share/nginx/html -RUN apt-get update && apt-get -y install vim dnsmasq +RUN apt-get update && apt-get -y install vim dnsmasq dnsutils RUN echo listen-address=127.0.0.1 > /etc/dnsmasq.d/dnsmasq.conf