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 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) (limited to 'Dockerfile') 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 + -- cgit v1.2.3