From d5da337d52478de57105cc3cf891f6e2098453d6 Mon Sep 17 00:00:00 2001 From: Vicente Falco Date: Mon, 15 May 2017 07:53:06 +0200 Subject: [PATCH] Jenkins - docker nginx --- Jenkinsfile | 2 +- services/nginx/Dockerfile | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 6e864b77f..15a019eb4 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 --link test-auth:auth --link test-salix:salix --link test-client:client"] +def dockerNginxName = ["nginx", "-p 80:8080 --cap-add NET_ADMIN --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 727770d37..0f88e31f2 100644 --- a/services/nginx/Dockerfile +++ b/services/nginx/Dockerfile @@ -8,4 +8,8 @@ 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 echo listen-address=127.0.0.1 > /etc/dnsmasq.d + EXPOSE 8080 \ No newline at end of file