Support multiple Dockerfiles with custom-docker-builder#1152
Merged
openshift-bot merged 1 commit intoopenshift:masterfrom Feb 26, 2015
colemickens:patch-1
Merged
Support multiple Dockerfiles with custom-docker-builder#1152openshift-bot merged 1 commit intoopenshift:masterfrom colemickens:patch-1
openshift-bot merged 1 commit intoopenshift:masterfrom
colemickens:patch-1
Conversation
Contributor
|
Suggest a more descriptive name for this PR/commit LGTM otherwise, @bparees ? |
Contributor
|
yeah please squash and update the descriptions on your commits, but it looks good otherwise. |
colemickens
changed the title
colemickens
changed the title
Contributor
Author
|
Fixed. |
Contributor
|
[merge] |
Contributor
|
continuous-integration/openshift-jenkins/merge SUCCESS (https://ci.openshift.redhat.com/jenkins/job/merge_pull_requests_openshift3/1039/) (Image: devenv-fedora_895) |
Contributor
|
Evaluated for origin up to 8a2a2b7 |
openshift-bot
pushed a commit
that referenced
this pull request
Feb 26, 2015
Merged by openshift-bot
Contributor
Author
|
Small question, what's the publish cadence for that Dockerfile? |
Contributor
|
it's automated by pushes to the repo, so you should be good to pick it up: |
Contributor
Author
|
So, I fear that this was a bad change to introduce. The openshift/origin-custom-docker-builder image is based on openshift/origin-base which is based on centos:centos7 which ships docker 1.3. The My apologies for not testing this more thoroughly before submitting. I'm currently proceeding with a custom builder that I'm testing locally, and then I can revisit this. In this case, should I submit a PR backing out my change, or will a maintainer do so for me? |
Contributor
|
yeah that dawned on me a few hours ago, but I was hoping by some miracle centos was on 1.5 :) i'll revert it. |
Contributor
Author
|
Reverted by #1177. |
jpeeler
pushed a commit
to jpeeler/origin
that referenced
this pull request
Sep 5, 2017
…service-catalog/' changes from 7e650e7e39..ef63307bdb ef63307bdb origin build: add origin tooling a876fe3 v0.0.17 (openshift#1178) c5237fe correct osbapi service definition (openshift#1177) 6036d4e Adding walkthrough instructions for 1.7 (openshift#1171) 5f111dd Specifying that you need Helm v2.5.0 for installation (openshift#1170) 08043bd Adding more small fixes to the walkthrough & install docs (openshift#1169) d65d4a1 rbac targets needed to be renamed as well (openshift#1161) 590f6f2 Write helm command to file for api aggregation (openshift#1141) 49ddcf6 clean before building a specific arch (openshift#1168) 43f7cfb Splitting up the Walkthrough for 1.6 and 1.7 instructions (openshift#1163) 02e0217 Updates to README (openshift#1166) 57f2aa5 Adding instructions for installing from Macs (openshift#1164) dfe620e fix rate-limiting for polling queue (openshift#1143) ca5f335 Use Generation instead of checksum for Broker (openshift#1145) 5364daa Merge branch 'pr/1158' f34c5db move Travis deployment script to directory in 'contrib/' 2a00d7f Update incorrect port (openshift#1156) b0ed60e improve the repository's layout (openshift#1154) f870baf Follow up file / renames from openshift#1142 (openshift#1152) 826b4f9 remove unnecessary json annotations (openshift#1153) 33cb345 Rename resources. closes openshift#1080 (openshift#1142) 70c2b9b Add ability to specify CA certs to use for TLS authentication. (openshift#1112) 2aa5039 v0.0.16 (openshift#1140) 65de49c Comments for unit test bullet proofing (openshift#1139) REVERT: 7e650e7e39 origin build: add origin tooling git-subtree-dir: cmd/service-catalog/go/src/github.com/kubernetes-incubator/service-catalog git-subtree-split: ef63307bdbaa64efca204912f5361a4f3d3be2c8
jpeeler
pushed a commit
to jpeeler/origin
that referenced
this pull request
Sep 11, 2017
…service-catalog/' changes from 7e650e7e39..ef63307bdb ef63307bdb origin build: add origin tooling a876fe3 v0.0.17 (openshift#1178) c5237fe correct osbapi service definition (openshift#1177) 6036d4e Adding walkthrough instructions for 1.7 (openshift#1171) 5f111dd Specifying that you need Helm v2.5.0 for installation (openshift#1170) 08043bd Adding more small fixes to the walkthrough & install docs (openshift#1169) d65d4a1 rbac targets needed to be renamed as well (openshift#1161) 590f6f2 Write helm command to file for api aggregation (openshift#1141) 49ddcf6 clean before building a specific arch (openshift#1168) 43f7cfb Splitting up the Walkthrough for 1.6 and 1.7 instructions (openshift#1163) 02e0217 Updates to README (openshift#1166) 57f2aa5 Adding instructions for installing from Macs (openshift#1164) dfe620e fix rate-limiting for polling queue (openshift#1143) ca5f335 Use Generation instead of checksum for Broker (openshift#1145) 5364daa Merge branch 'pr/1158' f34c5db move Travis deployment script to directory in 'contrib/' 2a00d7f Update incorrect port (openshift#1156) b0ed60e improve the repository's layout (openshift#1154) f870baf Follow up file / renames from openshift#1142 (openshift#1152) 826b4f9 remove unnecessary json annotations (openshift#1153) 33cb345 Rename resources. closes openshift#1080 (openshift#1142) 70c2b9b Add ability to specify CA certs to use for TLS authentication. (openshift#1112) 2aa5039 v0.0.16 (openshift#1140) 65de49c Comments for unit test bullet proofing (openshift#1139) REVERT: 7e650e7e39 origin build: add origin tooling git-subtree-dir: cmd/service-catalog/go/src/github.com/kubernetes-incubator/service-catalog git-subtree-split: ef63307bdbaa64efca204912f5361a4f3d3be2c8
jpeeler
pushed a commit
to jpeeler/origin
that referenced
this pull request
Feb 1, 2018
* Follow up file / renames from openshift#1142 * fix whitespace
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This would enable me to use the custom docker build with my project that utilizes many dockerfiles at the same level in a repository to build various docker images from one repo.