aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Copeland <ben.copeland@linaro.org>2020-02-11 11:56:39 +0000
committerBenjamin Copeland <ben.copeland@linaro.org>2020-02-11 11:56:39 +0000
commit6425f932cde9c423e2ed03fea36dcc940510c1fd (patch)
tree31910416dd4007f09d72793403ead0a6eca5c06c
parentfc0280ff478683b2b6f28886c2f7af62ff43d87d (diff)
downloaddockerfiles-6425f932cde9c423e2ed03fea36dcc940510c1fd.tar.gz
Jenkins: Add docker-compose file and modify perm spaceHEADmaster
Change-Id: Idcbbee904328cfea5585255a9f09ab0816988d9d
-rw-r--r--jessie-amd64-jenkins-master/.env2
-rw-r--r--jessie-amd64-jenkins-master/Dockerfile2
-rw-r--r--jessie-amd64-jenkins-master/docker-compose.yml26
3 files changed, 29 insertions, 1 deletions
diff --git a/jessie-amd64-jenkins-master/.env b/jessie-amd64-jenkins-master/.env
new file mode 100644
index 0000000..6c805a4
--- /dev/null
+++ b/jessie-amd64-jenkins-master/.env
@@ -0,0 +1,2 @@
+# Jenkins path on the host
+JENKINS_HOST_PATH=/srv/jenkins
diff --git a/jessie-amd64-jenkins-master/Dockerfile b/jessie-amd64-jenkins-master/Dockerfile
index e823a63..b5ddaac 100644
--- a/jessie-amd64-jenkins-master/Dockerfile
+++ b/jessie-amd64-jenkins-master/Dockerfile
@@ -1,7 +1,7 @@
FROM jenkins/jenkins:2.204.1
ENV JENKINS_JAVA_PARAMETERS="-server -XX:+AlwaysPreTouch -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/var/log/jenkins/heapdump.log -verbose:gc -Xloggc:/var/log/jenkins/gc-%t.log -XX:NumberOfGCLogFiles=2 -XX:+UseGCLogFileRotation -XX:GCLogFileSize=100m -XX:+PrintGC -XX:+PrintGCDateStamps -XX:+PrintGCDetails -XX:+PrintHeapAtGC -XX:+PrintGCCause -XX:+PrintTenuringDistribution -XX:+PrintReferenceGC -XX:+PrintAdaptiveSizePolicy -XX:+UseG1GC -XX:+UseStringDeduplication -XX:+ParallelRefProcEnabled -XX:+ExplicitGCInvokesConcurrent -XX:+UnlockDiagnosticVMOptions -XX:G1SummarizeRSetStatsPeriod=1 -XX:MaxMetaspaceExpansion=64M -Djenkins.model.Jenkins.logStartupPerformance=true"
-ENV JAVA_OPTS="-Xms1g -Xmx4g $JENKINS_JAVA_PARAMETERS -Djava.awt.headless=true -Dhudson.slaves.WorkspaceList='_' -Dhudson.model.ParametersAction.keepUndefinedParameters=true -Dorg.jenkinsci.plugins.gitclient.Git.timeOut=30 -Dorg.eclipse.jetty.server.Request.maxFormContentSize=1000000"
+ENV JAVA_OPTS="-Xms4g -Xmx4g $JENKINS_JAVA_PARAMETERS -Djava.awt.headless=true -Dhudson.slaves.WorkspaceList='_' -Dhudson.model.ParametersAction.keepUndefinedParameters=true -Dorg.jenkinsci.plugins.gitclient.Git.timeOut=30 -Dorg.eclipse.jetty.server.Request.maxFormContentSize=1000000"
ENV JENKINS_OPTS="--sessionTimeout=1440 --sessionEviction=86400"
# Install jenkins job builder
diff --git a/jessie-amd64-jenkins-master/docker-compose.yml b/jessie-amd64-jenkins-master/docker-compose.yml
new file mode 100644
index 0000000..0c22db0
--- /dev/null
+++ b/jessie-amd64-jenkins-master/docker-compose.yml
@@ -0,0 +1,26 @@
+version: '3'
+services:
+ jenkins:
+ image: 'trustedfirmware/ci-x86_64-jenkins-master-debian:lts'
+ container_name: jenkins-master
+ logging:
+ driver: journald
+ ports:
+ - "2222:2222"
+ - "2233:2233"
+ - "8080:8080"
+ - "50000:50000"
+ volumes:
+ - "${JENKINS_HOST_PATH}:/var/jenkins_home:rw"
+ gerrit:
+ image: 'debian:buster'
+ container_name: gerrit
+ logging:
+ driver: journald
+ ports:
+ - "2222:2222"
+ - "2233:2233"
+ - "8080:8080"
+ - "50000:50000"
+ volumes:
+ - "${JENKINS_HOST_PATH}:/var/jenkins_home:rw"