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

Added dockerfile key support #499

Merged
merged 1 commit into from
Mar 22, 2017

Conversation

surajnarwade
Copy link
Contributor

Fixes #486
This commit will add dockerfilepath key under Dockerstratergy in Buildconfig.
dockerfilepath allow us to use dockerfiles which are named different than Dockerfile

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Mar 20, 2017
@surajnarwade
Copy link
Contributor Author

cc @kadel @surajssd @cdrage

@cdrage
Copy link
Member

cdrage commented Mar 20, 2017

@cdrage
Copy link
Member

cdrage commented Mar 20, 2017

Tests need to be added too (cmd tests)

@kadel
Copy link
Member

kadel commented Mar 20, 2017

Wouldn't it have to be removed from: https://github.com/kubernetes-incubator/kompose/blob/master/pkg/loader/compose/compose.go#L80 as well?

yes, It shouldn't be there in the first place :-D This only tracks top level service keys, dockerfile is hidden in build key

@surajnarwade surajnarwade force-pushed the add_dockerfile_support branch from 0727418 to bb1b52e Compare March 21, 2017 04:05
@surajnarwade
Copy link
Contributor Author

surajnarwade commented Mar 21, 2017

@cdrage , for cmd-test, I have to add context in docker-compose, which will fail the test as PR #454 is blocked, once that PR is merged, I will add functional test for this one.

@cdrage
Copy link
Member

cdrage commented Mar 21, 2017

Few spelling errors in the commit message:

Fixes #486
This commit will add `dockerfilepath` key under Dockerstratergy in Buildconfig.
dockerfilepath allow us to use dockerfiles which are named different than `Dockerfile`

Please give an example as well in the commit message / elaborate :)

@surajnarwade surajnarwade force-pushed the add_dockerfile_support branch from bb1b52e to 61d4692 Compare March 22, 2017 07:25
@kadel
Copy link
Member

kadel commented Mar 22, 2017

needs rebase, but otherwise lgtm

Fixes kubernetes#486
This commit will add `dockerfilepath` key under Dockerstratergy in buildconfig.
dockerfilepath allow us to use dockerfiles which are named different than `Dockerfile` which are placed in context directory.

for example, for a docker-compose file:

```
version: "2"
services:
    foo:
        build:
            context: "./build"
            dockerfile: "Dockerfile-alternate"
        command: "sleep 3600"
```
Resulting buildconfig will be:

```
apiVersion: v1
kind: BuildConfig
...
...
  strategy:
    dockerStrategy:
      dockerfilePath: Dockerfile-alternate
    type: Docker
...
...
```
@surajnarwade surajnarwade force-pushed the add_dockerfile_support branch from 61d4692 to ec897ef Compare March 22, 2017 12:19
@surajnarwade
Copy link
Contributor Author

@kadel , done with rebase

Copy link
Member

@kadel kadel left a comment

Choose a reason for hiding this comment

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

@cdrage had some comments, lets wait for him to merge this. But its LGTM

@cdrage
Copy link
Member

cdrage commented Mar 22, 2017

@surajnarwade thank you for updating the commit message. LGTM! 👍

@cdrage cdrage merged commit 3ac6d9a into kubernetes:master Mar 22, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cncf-cla: yes Indicates the PR's author has signed the CNCF CLA.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants