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

Jenkins

This commit is contained in:
Vicente Falco 2017-05-15 08:33:51 +02:00
parent 8a9d8c83b6
commit 77d8a8f090
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Jenkinsfile vendored
View File

@ -7,7 +7,7 @@ def branchName = "${env.BRANCH_NAME}";
def branchNameTest = "preprod"; def branchNameTest = "preprod";
def branchNameProd = "master"; def branchNameProd = "master";
def prefixDocker = "test"; 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 dockerAuthName = ["auth", "-p 3000:3000"]
def dockerSalixName = ["salix", "-p 3001:3001"] def dockerSalixName = ["salix", "-p 3001:3001"]
def dockerClientName = ["client", "-p 3002:3002"] def dockerClientName = ["client", "-p 3002:3002"]

2
services/nginx/Dockerfile
View File

@ -8,7 +8,7 @@ COPY conf-prod.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 RUN apt-get update && apt-get -y install vim dnsmasq dnsutils
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