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: Merged
Approved by: Konrad Zapałowicz
Approved revision: c8005a1ac176eee0e527e4c400303298a68823a6
Merged at revision: 3e28533474182f6e3c4d22e3c01c9a825d5fcb9c
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: 46 lines (+14/-1)
2 files modified
docker/development/Dockerfile (+6/-1)
docker/development/plugins.txt (+8/-0)
Reviewer Review Type Date Requested Status
Konrad Zapałowicz (community) code Approve
System Enablement Bot continuous-integration Approve
Review via email: mp+332228@code.launchpad.net

This proposal supersedes 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 : 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)
Revision history for this message
System Enablement Bot (system-enablement-ci-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
Konrad Zapałowicz (kzapalowicz) wrote :

ack

review: Approve (code)

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..ca32d13 100644
3--- a/docker/development/Dockerfile
4+++ b/docker/development/Dockerfile
5@@ -50,8 +50,13 @@ 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
14+RUN mkdir -p /var/jenkins
15+RUN chown -R jenkins:jenkins /var/jenkins
16+
17+USER jenkins
18+
19 CMD ["/usr/local/bin/jenkins.sh"]
20diff --git a/docker/development/plugins.txt b/docker/development/plugins.txt
21index 5020d33..b4cc9ed 100644
22--- a/docker/development/plugins.txt
23+++ b/docker/development/plugins.txt
24@@ -1,3 +1,7 @@
25+ credentials
26+ ssh-credentials
27+ workflow-job
28+ workflow-durable-task-step
29 build-name-setter
30 conditional-buildstep
31 description-setter
32@@ -9,6 +13,8 @@
33 rebuild
34 timestamper
35 ws-cleanup
36+ apache-httpcomponents-client-4-api
37+ jsch
38 maven-plugin
39 token-macro
40 junit
41@@ -27,3 +33,5 @@
42 icon-shim
43 resource-disposer
44 run-condition
45+ workflow-support
46+ durable-task

Subscribers

People subscribed via source and target branches

to all changes: