Merge ~morphis/snappy-hwe-snaps/+git/jenkins-jobs:adjust-docker-container into ~snappy-hwe-team/snappy-hwe-snaps/+git/jenkins-jobs:master

Proposed by Simon Fels
Status: Superseded
Proposed branch: ~morphis/snappy-hwe-snaps/+git/jenkins-jobs:adjust-docker-container
Merge into: ~snappy-hwe-team/snappy-hwe-snaps/+git/jenkins-jobs:master
Diff against target: 40 lines (+9/-1)
2 files modified
docker/development/Dockerfile (+1/-1)
docker/development/plugins.txt (+8/-0)
Reviewer Review Type Date Requested Status
System Enablement Bot continuous-integration Approve
Review via email: mp+332227@code.launchpad.net

This proposal supersedes a proposal from 2017-10-13.

This proposal has been superseded by a proposal from 2017-10-13.

Description of the change

Adjust docker container

To post a comment you must log in.
Revision history for this message
System Enablement Bot (system-enablement-ci-bot) wrote : Posted in a previous version of this proposal
review: Approve (continuous-integration)
Revision history for this message
System Enablement Bot (system-enablement-ci-bot) wrote : Posted in a previous version of this proposal
review: Approve (continuous-integration)
Revision history for this message
System Enablement Bot (system-enablement-ci-bot) wrote : Posted in a previous version of this proposal
review: Approve (continuous-integration)
Revision history for this message
System Enablement Bot (system-enablement-ci-bot) wrote : Posted in a previous version of this proposal
review: Approve (continuous-integration)
Revision history for this message
System Enablement Bot (system-enablement-ci-bot) wrote :
review: Approve (continuous-integration)

Unmerged commits

687e98a... by Simon Fels

Add a few more plugins which need to be installed

2b44f0b... by Simon Fels

Specify correct home directory for java runtime

3a68f13... by Simon Fels

Add missing plugins for jenkins installation

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/docker/development/Dockerfile b/docker/development/Dockerfile
2index 7de0d07..d01d8bd 100644
3--- a/docker/development/Dockerfile
4+++ b/docker/development/Dockerfile
5@@ -50,7 +50,7 @@ RUN chmod +x /usr/local/bin/jenkins.sh
6
7 COPY initial-setup.groovy /usr/share/jenkins/ref/init.groovy.d/
8
9-ENV JAVA_OPTS -Djenkins.install.runSetupWizard=false
10+ENV JAVA_OPTS -Djenkins.install.runSetupWizard=false -Duser.home="$JENKINS_HOME"
11
12 EXPOSE 8080 50000
13
14diff --git a/docker/development/plugins.txt b/docker/development/plugins.txt
15index 5020d33..b4cc9ed 100644
16--- a/docker/development/plugins.txt
17+++ b/docker/development/plugins.txt
18@@ -1,3 +1,7 @@
19+ credentials
20+ ssh-credentials
21+ workflow-job
22+ workflow-durable-task-step
23 build-name-setter
24 conditional-buildstep
25 description-setter
26@@ -9,6 +13,8 @@
27 rebuild
28 timestamper
29 ws-cleanup
30+ apache-httpcomponents-client-4-api
31+ jsch
32 maven-plugin
33 token-macro
34 junit
35@@ -27,3 +33,5 @@
36 icon-shim
37 resource-disposer
38 run-condition
39+ workflow-support
40+ durable-task

Subscribers

People subscribed via source and target branches

to all changes: