Merge pull request #2 from vdupain/master
Adding url prefix for running jenkins behind Apache
diff --git a/Dockerfile b/Dockerfile
index 42a0dee..aa3600d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,15 +12,20 @@
RUN mkdir -p /var/jenkins_home && chown -R jenkins /var/jenkins_home
ADD init.groovy /tmp/WEB-INF/init.groovy
RUN cd /tmp && zip -g /usr/share/jenkins/jenkins.war WEB-INF/init.groovy
+ADD ./jenkins.sh /usr/local/bin/jenkins.sh
+RUN chmod +x /usr/local/bin/jenkins.sh
USER jenkins
# VOLUME /var/jenkins_home - bind this in via -v if you want to make this persistent.
ENV JENKINS_HOME /var/jenkins_home
+# define url prefix for running jenkins behind Apache (https://wiki.jenkins-ci.org/display/JENKINS/Running+Jenkins+behind+Apache)
+ENV JENKINS_PREFIX /
+
# for main web interface:
EXPOSE 8080
# will be used by attached slave agents:
EXPOSE 50000
-CMD ["/usr/bin/java", "-jar", "/usr/share/jenkins/jenkins.war"]
+CMD ["/usr/local/bin/jenkins.sh"]
diff --git a/jenkins.sh b/jenkins.sh
new file mode 100644
index 0000000..57863bb
--- /dev/null
+++ b/jenkins.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+exec java -jar /usr/share/jenkins/jenkins.war --prefix=$JENKINS_PREFIX