diff --git a/Dockerfile b/Dockerfile index cfb8af3cc69eaf90e2e7a5cbf6256ee18c7637bf..312af5f186f1df5027f38be0d580e49d9d1d49eb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ # Jenkins # # REPOSITORY registry.codemate.se/jenkins -# VERSION 1.0.1 +# VERSION 1.0.0 FROM dockerfile/java MAINTAINER Erik Hedenström <erik@codemate.se> @@ -12,17 +12,35 @@ ENV DEBIAN_PRIORITY critical ENV DEBCONF_NOWARNINGS yes # Set Timezone -RUN echo "Europe/Stockholm" > /etc/timezone && dpkg-reconfigure -f noninteractive tzdata +RUN \ + echo "Europe/Stockholm" > /etc/timezone && \ + dpkg-reconfigure -f noninteractive tzdata # Fix locale -RUN locale-gen en_US.UTF-8 -RUN echo "LANG=\"en_US.UTF-8\"" > /etc/default/locale && echo "LANGUAGE=\"en_US:en\"" >> /etc/default/locale +RUN \ + locale-gen en_US.UTF-8 && \ + echo "LANG=\"en_US.UTF-8\"" > /etc/default/locale && \ + echo "LANGUAGE=\"en_US.UTF8\"" >> /etc/default/locale && \ + echo "LC_ALL=\"en_US.UTF8\"" >> /etc/default/locale + +# Import self-signed cert as trusted CA +RUN \ + openssl s_client -servername cert.codemate.se -connect codemate.se:443 </dev/null | sed -ne '/--BEGIN CERTIFICATE--/,/--END CERTIFICATE--/p' > /tmp/codemate.cert && \ + keytool -import -noprompt -trustcacerts -keystore /usr/lib/jvm/java-7-oracle/jre/lib/security/cacerts -storepass changeit -noprompt -alias codemate-self-signed -file /tmp/codemate.cert + +# Install and configure Exim +RUN \ + apt-get -y install exim4-daemon-light && \ + sed -i -e "s/dc_eximconfig_configtype='local'/dc_eximconfig_configtype='internet'/" /etc/exim4/update-exim4.conf.conf && \ + sed -i -e "s/127.0.0.1/0.0.0.0/" /etc/exim4/update-exim4.conf.conf && \ + update-exim4.conf # Install Jenkins -RUN echo "deb http://pkg.jenkins-ci.org/debian binary/" > /etc/apt/sources.list.d/jenkins.list -RUN curl http://pkg.jenkins-ci.org/debian/jenkins-ci.org.key | apt-key add - -RUN apt-get update -RUN apt-get -y install jenkins +RUN \ + echo "deb http://pkg.jenkins-ci.org/debian binary/" > /etc/apt/sources.list.d/jenkins.list && \ + curl http://pkg.jenkins-ci.org/debian/jenkins-ci.org.key | apt-key add - && \ + apt-get update && \ + apt-get -y install jenkins # Add startup script and SSH config ADD ssh /etc/ssh/jenkins @@ -32,4 +50,4 @@ ADD init.sh /init.sh ENV JAVA_ARGS "-Xmx512m" EXPOSE 8080 8081 33848/udp VOLUME ["/var/lib/jenkins"] -CMD ["/bin/bash", "/init.sh"] \ No newline at end of file +CMD ["/bin/bash", "/init.sh"]