diff --git a/docker-compose.yml b/docker-compose.yml index d25abd4..d16db7e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,10 +2,11 @@ services: master-jenkins: - image: jenkins:alpine + image: jenkins/jenkins:lts mem_limit: 2g environment: - - JAVA_OPTS="-Djava.util.logging.config.file=/var/jenkins_home/log.properties" + - JAVA_OPTS="-Djava.util.logging.config.file=/var/jenkins_home/log.properties ${JENKINS_ADDITIONAL_JAVA_OPTS}" + - TZ=${TZ} volumes: - /etc/localtime:/etc/localtime:ro - /etc/timezone:/etc/timezone:ro diff --git a/jenkins.conf b/jenkins.conf index 7357ca9..58b1980 100644 --- a/jenkins.conf +++ b/jenkins.conf @@ -9,8 +9,16 @@ # http bind host and port JENKINS_HTTP_BIND=127.0.0.1 -JENKINS_HTTP_PORT=8080 +JENKINS_HTTP_PORT=8081 # java api bind host and port JENKINS_API_BIND=127.0.0.1 JENKINS_API_PORT=50000 + +# additional java options like +# -Dhudson.footerURL=http://mycompany.com +JENKINS_ADDITIONAL_JAVA_OPTS="" + + +# Timezone one of /usr/share/zoneinfo +TZ=Europe/Berlin