Merge pull request #803 from activeobjects/master

Added support for jenkins official container
2017-04-13 11:48:57 -04:00
parent b1367d237f 81053c0868
commit c78eb5228a
26 changed files with 1459 additions and 0 deletions
--- a/docker-compose.yml
+++ b/docker-compose.yml
@ -517,6 +517,19 @@ services:
        - proxy
        - proxy2

+### Jenkins ###################################################
+    jenkins:
+      build: ./jenkins
+      environment:
+        JAVA_OPTS: "-Djava.awt.headless=true"
+      ports:
+        - "${JENKINS_HOST_SLAVE_AGENT_PORT}:50000"
+        - "${JENKINS_HOST_HTTP_PORT}:8080"      
+      privileged: true
+      volumes:
+        - ${JENKINS_HOME}:/var/jenkins_home        
+        - /var/run/docker.sock:/var/run/docker.sock
+
 ### Networks Setup ############################################

 networks: