diff --git a/docker-compose.yml b/docker-compose.yml index 2af6ca6..21cf2a3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,10 +2,10 @@ services: master-jenkins: - image: jenkins:alpine + image: jenkinsci/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 diff --git a/jenkins.conf b/jenkins.conf index 58ab83d..58b1980 100644 --- a/jenkins.conf +++ b/jenkins.conf @@ -15,6 +15,10 @@ 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