Skip to content

Commit

Permalink
Merge pull request #2 from vdupain/master
Browse files Browse the repository at this point in the history
Adding url prefix for running jenkins behind Apache
  • Loading branch information
michaelneale committed Aug 22, 2014
2 parents a5bfd41 + 1ac0bcd commit a994f2f
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 1 deletion.
7 changes: 6 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,20 @@ RUN apt-get update && apt-get install -y jenkins
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"]
3 changes: 3 additions & 0 deletions jenkins.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#!/bin/bash

exec java -jar /usr/share/jenkins/jenkins.war --prefix=$JENKINS_PREFIX

0 comments on commit a994f2f

Please sign in to comment.