From b76171e5898f3ba40d492a9dee991cb90ff21b5c Mon Sep 17 00:00:00 2001 From: Cody Hiar Date: Mon, 7 Jan 2019 22:50:51 -0700 Subject: Auto install plugins, use system docker --- Dockerfile | 21 ++++------- docker-compose.yml | 1 + plugins.txt | 103 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 111 insertions(+), 14 deletions(-) create mode 100644 plugins.txt diff --git a/Dockerfile b/Dockerfile index f20433e..0cebe94 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,21 +3,14 @@ FROM jenkins/jenkins:lts USER root RUN apt-get update && apt-get -y install \ - apt-transport-https \ - ca-certificates \ - curl \ - gnupg2 \ - software-properties-common && \ - curl -fsSL https://download.docker.com/linux/$(. /etc/os-release; echo "$ID")/gpg > /tmp/dkey; apt-key add /tmp/dkey && \ - add-apt-repository \ - "deb [arch=amd64] https://download.docker.com/linux/$(. /etc/os-release; echo "$ID") \ - $(lsb_release -cs) \ - stable" && \ - apt-get update && \ - apt-get -y install docker-ce + build-essential -RUN apt-get install -y docker-ce +# Install Plugins +COPY plugins.txt /usr/share/jenkins/ref/plugins.txt +RUN /usr/local/bin/install-plugins.sh < /usr/share/jenkins/ref/plugins.txt -RUN usermod -a -G docker jenkins +# Prevent plugin install banner, we've pre-installed our plugins +RUN echo 2.0 > /usr/share/jenkins/ref/jenkins.install.UpgradeWizard.state USER jenkins + diff --git a/docker-compose.yml b/docker-compose.yml index e19fd83..6219e27 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,3 +11,4 @@ services: volumes: - ./jenkins_home:/var/jenkins_home - /var/run/docker.sock:/var/run/docker.sock + - /usr/bin/docker:/usr/bin/docker diff --git a/plugins.txt b/plugins.txt new file mode 100644 index 0000000..cc65a7f --- /dev/null +++ b/plugins.txt @@ -0,0 +1,103 @@ +ace-editor:1.1 +antisamy-markup-formatter:1.5 +apache-httpcomponents-client-4-api:4.5.5-3.0 +authentication-tokens:1.3 +blueocean-autofavorite:1.2.2 +blueocean-bitbucket-pipeline:1.10.1 +blueocean-commons:1.10.1 +blueocean-config:1.10.1 +blueocean-core-js:1.10.1 +blueocean-dashboard:1.10.1 +blueocean-display-url:2.2.0 +blueocean-events:1.10.1 +blueocean-git-pipeline:1.10.1 +blueocean-github-pipeline:1.10.1 +blueocean-i18n:1.10.1 +blueocean-jira:1.10.1 +blueocean-jwt:1.10.1 +blueocean-personalization:1.10.1 +blueocean-pipeline-api-impl:1.10.1 +blueocean-pipeline-editor:1.10.1 +blueocean-pipeline-scm-api:1.10.1 +blueocean-rest-impl:1.10.1 +blueocean-rest:1.10.1 +blueocean-web:1.10.1 +blueocean:1.10.1 +bouncycastle-api:2.17 +branch-api:2.1.2 +build-timeout:1.19 +cloudbees-bitbucket-branch-source:2.3.0 +cloudbees-folder:6.7 +command-launcher:1.3 +credentials-binding:1.17 +credentials:2.1.18 +display-url-api:2.3.0 +docker-commons:1.13 +docker-workflow:1.17 +durable-task:1.28 +email-ext:2.63 +favorite:2.3.2 +git-client:2.7.5 +git-server:1.7 +git:3.9.1 +github-api:1.95 +github-branch-source:2.4.1 +github:1.29.3 +handlebars:1.1.1 +handy-uri-templates-2-api:2.1.6-1.0 +htmlpublisher:1.17 +jackson2-api:2.9.8 +jdk-tool:1.2 +jenkins-design-language:1.10.1 +jira:3.0.5 +jquery-detached:1.2.1 +jsch:0.1.54.2 +junit:1.26.1 +ldap:1.20 +locale:1.4 +lockable-resources:2.3 +mailer:1.23 +matrix-auth:2.3 +matrix-project:1.13 +mercurial:2.4 +momentjs:1.1.1 +pam-auth:1.4 +pipeline-build-step:2.7 +pipeline-github-lib:1.0 +pipeline-graph-analysis:1.9 +pipeline-input-step:2.9 +pipeline-milestone-step:1.3.1 +pipeline-model-api:1.3.4 +pipeline-model-declarative-agent:1.1.1 +pipeline-model-definition:1.3.4 +pipeline-model-extensions:1.3.4 +pipeline-rest-api:2.10 +pipeline-stage-step:2.3 +pipeline-stage-tags-metadata:1.3.4 +pipeline-stage-view:2.10 +plain-credentials:1.5 +pubsub-light:1.12 +resource-disposer:0.12 +scm-api:2.3.0 +script-security:1.49 +sse-gateway:1.17 +ssh-agent:1.17 +ssh-credentials:1.14 +ssh-slaves:1.29.4 +ssh:2.6.1 +structs:1.17 +timestamper:1.8.10 +token-macro:2.5 +variant:1.1 +workflow-aggregator:2.6 +workflow-api:2.33 +workflow-basic-steps:2.13 +workflow-cps-global-lib:2.12 +workflow-cps:2.61 +workflow-durable-task-step:2.27 +workflow-job:2.31 +workflow-multibranch:2.20 +workflow-scm-step:2.7 +workflow-step-api:2.17 +workflow-support:3.0 +ws-cleanup:0.37 -- cgit v1.2.3