diff --git a/Dockerfile b/Dockerfile index d988461d..880e3e7b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,12 +1,26 @@ -FROM jenkins/jenkins:2.414.2-jdk11 -USER root -RUN apt-get update && apt-get install -y lsb-release python3-pip +FROM jenkins/jenkins:2.426.1-jdk11 # Upgrade to match required version + +# Switch to root for installing dependencies +USER root + +# Install required packages +RUN apt-get update && apt-get install -y \ + lsb-release \ + python3-pip + +# Add Docker's official GPG key RUN curl -fsSLo /usr/share/keyrings/docker-archive-keyring.asc \ - https://download.docker.com/linux/debian/gpg -RUN echo "deb [arch=$(dpkg --print-architecture) \ - signed-by=/usr/share/keyrings/docker-archive-keyring.asc] \ - https://download.docker.com/linux/debian \ - $(lsb_release -cs) stable" > /etc/apt/sources.list.d/docker.list + https://download.docker.com/linux/debian/gpg + +# Set up the Docker repository +RUN echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/docker-archive-keyring.asc] \ + https://download.docker.com/linux/debian $(lsb_release -cs) stable" > /etc/apt/sources.list.d/docker.list + +# Install Docker CLI RUN apt-get update && apt-get install -y docker-ce-cli + +# Switch back to the Jenkins user USER jenkins -RUN jenkins-plugin-cli --plugins "blueocean:1.25.3 docker-workflow:1.28" \ No newline at end of file + +# Install Jenkins plugins +RUN jenkins-plugin-cli --plugins "blueocean:1.25.3 docker-workflow:1.28"