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.

Sign up for GitHub

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

Jump to bottom

Make docker dir configurable #188

Merged
merged 3 commits into from
Jan 21, 2020
Merged

Make docker dir configurable #188

merged 3 commits into from
Jan 21, 2020

Conversation

oalyman
Copy link
Contributor

@oalyman oalyman commented Jan 21, 2020

Resolves #181

michaelsauter
michaelsauter reviewed Jan 21, 2020
View reviewed changes
Copy link
Member

@michaelsauter michaelsauter left a comment

Choose a reason for hiding this comment

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

Cool 👍

src/org/ods/OdsContext.groovy
@@ -436,6 +440,10 @@ class OdsContext implements Context {
config.displayNameUpdateEnabled = displayNameUpdateEnabled
}

String getDockerDir() {
return config.dockerDir
}
Copy link
Member

Choose a reason for hiding this comment

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

I think you'll need to add this to the Context interface too.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done.

docs/modules/ROOT/pages/index.adoc Outdated
@@ -290,6 +290,9 @@ When you write stages, you have access to both global variables (defined without

| ciSkip
| Whether the build should be skipped, based on the Git commit message.

| dockerDir
| The docker directory to use when building the image in openshift
Copy link
Member

Choose a reason for hiding this comment

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

Maybe this could be "The Docker context directory to use when building the image in OpenShift. Defaults to docker."?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done.

@michaelsauter michaelsauter added this to To Do in OpenDevStack 3.0 via automation Jan 21, 2020
@oalyman oalyman merged commit 8ffe7e2 into opendevstack:master Jan 21, 2020
OpenDevStack 3.0 automation moved this from To Do to Done Jan 21, 2020
michaelsauter pushed a commit to BIX-Digital/ods-jenkins-shared-library that referenced this pull request Apr 27, 2020
@clemensutschig
Feature/add mono repo support for MRO (opendevstack#188)
355855e
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@michaelsauter michaelsauter michaelsauter approved these changes

@clemensutschig clemensutschig Awaiting requested review from clemensutschig

Assignees
No one assigned
Labels
None yet
Projects
No open projects
OpenDevStack 3.0
  
Done
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Be able to configure the docker directory to use when building
2 participants
@oalyman @michaelsauter