-
Notifications
You must be signed in to change notification settings - Fork 411
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
Add marker file via Dockerfile. Script will remove marker and exit if… #198
base: master
Are you sure you want to change the base?
Add marker file via Dockerfile. Script will remove marker and exit if… #198
Conversation
… marker is present.
@@ -95,6 +111,16 @@ _retry_time = 30000; // how long to wait before checking for an update site to | |||
_cert_error_str = "CertificateExpiredException: NotAfter: Tue Oct 19 14:31:36 EDT 2021"; | |||
|
|||
// MAIN CODE BODY | |||
info("Checking for first run inside an OCI container"); | |||
// The Dockerfile will need to create this file. It will prevent this script from running. | |||
noRunFilePath = "/var/jenkins_home/init.groovy.d/DO_NOT_RUN_UC_REMEDIATION"; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I would store this marker file outside of the init.groovy folder in case jenkins tries to "run" it during the initial install
if (noRunFile.exists()) { | ||
info("Found marker file for first run. Removing file and exiting") | ||
noRunFile.delete() | ||
return "NO_CHANGE_NEEDED" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
return "SKIPPING_FIRST_RUN"
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
do I need to add it to the list of ok returns or have it handle that as an error?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
yeah, probably. i'd treat it as a success
uc-certificate-fix/Dockerfile
Outdated
RUN mkdir -p /var/jenkins_home/init.groovy.d | ||
COPY ./ucCertRemediation.groovy /var/jenkins_home/init.groovy.d/ | ||
|
||
RUN touch /var/jenkins_home/init.groovy.d/DO_NOT_RUN_UC_REMEDIATION && \ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
suggest not storing this in the init.groovy.d folder so that jenkins doesn't try to run it
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good plan
…ew return value SKIPPING_FIRST_RUN.
… marker is present.