Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Include the Plugin Installation Manager Tool into the Vanilla base image #198

Merged
merged 3 commits into from Nov 19, 2019

Conversation

mostafahussein
Copy link
Contributor

@mostafahussein mostafahussein commented Oct 13, 2019

This PR adds jenkins-plugin-manager to the final jenkinsfile-runner image which gives the ability to install custom plugins afterwards by using the image as base like the following:

FROM jenkins-runner-vanilla:latest
COPY plugins.txt /usr/share/jenkins/ref/plugins.txt
RUN cd /app/jenkins && jar -cvf jenkins.war *
RUN java -jar /app/bin/jenkins-plugin-manager.jar --war /app/jenkins/jenkins.war --plugin-file /usr/share/jenkins/ref/plugins.txt && rm /app/jenkins/jenkins.war

This will close #190 and close #189 after adding the documentation to this PR
Notes:
I couldn't make jenkins-plugin-manager to use the /app/jenkins directly like the runner command line can.
So can we make this possible in order to get rid of the extra line where I package the directory to war file?

Also, I have noticed this message:

Will use war file: /app/jenkins/jenkins.war
Unable to get version from war file

CC @stopalopa

Copy link
Member

@oleg-nenashev oleg-nenashev left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for your pull request!
Would it be possible to also add a small demo describing how to use it in downstream images?

@@ -25,8 +25,10 @@ RUN mkdir /app && unzip /jenkinsfile-runner/vanilla-package/target/war/jenkins.w

FROM openjdk:8-jdk
ENV JENKINS_UC https://updates.jenkins.io
ENV JENKINS_PM_VERSION 0.1-alpha-10
ENV JENKINS_PM_URL https://github.com/jenkinsci/plugin-installation-manager-tool/releases/download/plugin-management-parent-pom-$JENKINS_PM_VERSION/jenkins-plugin-manager-$JENKINS_PM_VERSION.jar
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wonder why it is located in POM instead of CLI. CC @stopalopa

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you mean that we should move these lines to be installed through the POM ?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry, missed the ping. No, no action required here. It is rather about the GitHub releases deployment

@mostafahussein
Copy link
Contributor Author

I will work on this PR today to resolve the conflict and add an example to the docs

@mostafahussein
Copy link
Contributor Author

@oleg-nenashev Dockerfile and docs updated. Can you please review it again ? note that the current conflict because I have modified steps that should be added - if you approved - instead of the master version

Copy link
Member

@oleg-nenashev oleg-nenashev left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Documentation needs to be moved/enhanced before the release, but I will do it in a follow-up

@oleg-nenashev oleg-nenashev changed the title add jenkins-plugin-manager Add the Plugin Installation Manager Tool to the Vanilla base image Nov 10, 2019
@oleg-nenashev oleg-nenashev added the enhancement New feature or request label Nov 10, 2019
@oleg-nenashev oleg-nenashev changed the title Add the Plugin Installation Manager Tool to the Vanilla base image Include the Plugin Installation Manager Tool into the Vanilla base image Nov 10, 2019
@oleg-nenashev oleg-nenashev merged commit 1a25d1c into jenkinsci:master Nov 19, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request hacktoberfest
Projects
None yet
2 participants