deep-stack/kompose
7
0
Fork 0
forked from LaconicNetwork/kompose
Code Pull Requests Activity

Updated docs for openshift buildconfig feature

Browse Source 
- Added buildconfig doc in user guide.
- Add inline code documentation to explain why buildconfig
  object needs to be created after imagestream, because of
  https://github.com/openshift/origin/issues/4518
This commit is contained in:
Ratnadeep Debnath 2016-12-27 20:22:49 +05:30
parent 7c959b65d4
commit 0d86f3e087
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
docs/user-guide.md
View File

@ -95,7 +95,7 @@ INFO[0000] file "result-imagestream.json" created
``` ```
In similar way you can convert DAB files to OpenShift. In similar way you can convert DAB files to OpenShift.
```console$ ```console
$ kompose --bundle docker-compose-bundle.dab --provider openshift convert $ kompose --bundle docker-compose-bundle.dab --provider openshift convert
WARN[0000]: Unsupported key networks - ignoring WARN[0000]: Unsupported key networks - ignoring
INFO[0000] file "redis-svc.json" created INFO[0000] file "redis-svc.json" created
@ -106,6 +106,19 @@ INFO[0000] file "redis-deploymentconfig.json" created
INFO[0000] file "redis-imagestream.json" created INFO[0000] file "redis-imagestream.json" created
``` ```
It also supports creating buildconfig for build directive in a service. By default, it uses the remote repo for the current git branch as the source repo, and the current branch as the source branch for the build. You can specify a different source repo and branch using ``--build-repo`` and ``--build-branch`` options respectively.
```console
kompose --provider openshift --file buildconfig/docker-compose.yml convert
WARN[0000] [foo] Service cannot be created because of missing port.
INFO[0000] Buildconfig using git@github.com:rtnpro/kompose.git::master as source.
INFO[0000] file "foo-deploymentconfig.json" created
INFO[0000] file "foo-imagestream.json" created
INFO[0000] file "foo-buildconfig.json" created
```
**Note**: If you are manually pushing the Openshift artifacts using ``oc create -f``, you need to ensure that you push the imagestream artifact before the buildconfig artifact, to workaround this Openshift issue: https://github.com/openshift/origin/issues/4518 .
## Kompose up ## Kompose up
Kompose supports a straightforward way to deploy your "composed" application to Kubernetes or OpenShift via `kompose up`. Kompose supports a straightforward way to deploy your "composed" application to Kubernetes or OpenShift via `kompose up`.

1
pkg/transformer/openshift/openshift.go
View File

@ -329,6 +329,7 @@ func (o *OpenShift) Transform(komposeObject kobject.KomposeObject, opt kobject.C
objects = append(objects, o.initImageStream(name, service)) objects = append(objects, o.initImageStream(name, service))
} }
// buildconfig needs to be added to objects after imagestream because of this Openshift bug: https://github.com/openshift/origin/issues/4518
if service.Build != "" { if service.Build != "" {
if !hasBuild { if !hasBuild {
composeFileDir, err = getComposeFileDir(opt.InputFile) composeFileDir, err = getComposeFileDir(opt.InputFile)