deep-stack/kompose
7
0
Fork 0
forked from LaconicNetwork/kompose
Code Pull Requests Activity
784 Commits 4 Branches 1 Tag 32 MiB
ce32bb817d
Commit Graph

784 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Charlie Drage
ce32bb817d 2016 -> 2017 for licensing 
New year, update to the license.
 2017-06-28 10:49:52 -04:00
Tomas Kral
1cc7e2c7f9 Merge pull request #670 from cdrage/add-v3-example 
Add v3 example
 2017-06-23 15:37:55 +02:00
Charlie Drage
06443f594c Add v3 example 
Same example as docker-compose.yaml but with 3 in the version name.

Needed for 1.0.0 blog post!
 2017-06-23 08:51:27 -04:00
Tomas Kral
2e9816e5bf Merge pull request #667 from cdrage/update-docsss 
Change title to build and push images
 2017-06-23 14:26:17 +02:00
Tomas Kral
13e9e6ccff Merge pull request #668 from cdrage/update-examples 
Remove 'cdrage' username from example
 2017-06-23 14:25:56 +02:00
Charlie Drage
3694f2535e Remove 'cdrage' username from example 
Removes username in favour of a foobar username
 2017-06-22 15:43:14 -04:00
Charlie Drage
e004a10d15 Change title to build and push images 
Changes the header in the user-guide.md in regards to building and
pushing docker images
 2017-06-22 15:41:33 -04:00
Charlie Drage
df663e4a65 Merge pull request #648 from cdrage/update-user-guide-with-build 
Update documentation to reflect build/push and v3 changes
 2017-06-22 09:19:04 -04:00
Charlie Drage
6323fa1aac Merge pull request #663 from cdrage/update-vend 
Update vendoring for Cobra CLI fix
 2017-06-22 09:18:31 -04:00
Charlie Drage
b9037890f4 Update documentation to reflect build/push and v3 changes 
Adds a user guide on how to use the build/push functionality of Docker
images to the user guide.

Adds v3 documentation as well as cleans up the user guide as well.

I also do minor changes such as removing `$ ` in the CLI examples, as
it's easier to copy and paste without the `$ ` there (when double
clicking).

I've also changed the `console` yaml indicitors to `sh` since it doesn't
matter / it's aliased, see:
https://github.com/github/linguist/blob/master/lib/linguist/languages.yml
 2017-06-21 07:59:07 -04:00
Charlie Drage
cf39f78435 Merge pull request #653 from cdrage/remove-dab 
Disable dab
 2017-06-21 07:39:59 -04:00
Tomas Kral
2159b18454 Merge pull request #645 from cdrage/update-roadmap 
Update ROADMAP
 2017-06-21 08:28:42 +02:00
Suraj Deshmukh
04748ee153 Merge pull request #662 from surajnarwade/minor-fix 
Removing unused function taggedimage
 2017-06-21 11:25:10 +05:30
Charlie Drage
ab149def6b Update vendoring for Cobra CLI fix 
Updates the vendoring in order to implement the fix for MarkDeprecated
output in the CLI

See: https://github.com/spf13/cobra/pull/466

Closes https://github.com/kubernetes-incubator/kompose/issues/652
 2017-06-20 14:25:02 -04:00
Charlie Drage
507c9baa83 Merge pull request #660 from cdrage/fix-vet 
Fix vet issues with build/push code
 2017-06-20 12:55:50 -04:00
Charlie Drage
c5cac569a2 Merge pull request #658 from kadel/fixv3EnvSubstitution 
fix env substitution for docker compose v3
 2017-06-20 09:41:20 -04:00
Tomas Kral
ef8c7a7a0a
fix env substitution for docker compose v3 2017-06-20 15:16:12 +02:00
Suraj Narwade
c36a215f19 Removing unused function taggedimage 2017-06-20 18:35:27 +05:30
Charlie Drage
b8a46895a6 Disable DAB 
See issue: https://github.com/kubernetes-incubator/kompose/issues/390

Disable DAB as it is hard to maintain / not much usage / DAB is still
experimental in Docker and there hasn't been much movement:
https://github.com/moby/moby/issues/26876

MarkDeprecated does not work at the moment due to issue:
https://github.com/kubernetes-incubator/kompose/issues/652

However, that is not a blocker as we `fatalF` within `ValidateFlags`
 2017-06-20 09:02:53 -04:00
Charlie Drage
f6363dd89c Fix vet issues with build/push code 
This fixes the vet issues when running `make vet` due to unkeyed fields.
 2017-06-20 08:58:09 -04:00
Charlie Drage
4a267c160a Merge pull request #655 from procrypt/composeTestIssue 
Changing printf verb in compose_test.go
 2017-06-20 08:27:22 -04:00
Abhishek
1401a39cbd Changing printf verb %s to %v in compose_test.go 2017-06-20 09:58:22 +05:30
Charlie Drage
ee7961216f Merge pull request #603 from procrypt/error_with_volume_name 
PVC name changes if volumes containes .(dot) in it
 2017-06-19 09:39:59 -04:00
Suraj Deshmukh
572d0c35b8 Merge pull request #649 from surajnarwade/vendor-update 
Updating Vendor for adding compoe v2 extends
 2017-06-17 11:26:28 +05:30
Suraj Deshmukh
1c4fe8424f Merge pull request #596 from procrypt/envs 
update the artifacts to be in ascending order
 2017-06-17 11:20:10 +05:30
Suraj Narwade
d2253f1eb2 Updating Vendor 
resolves #620 as libcompose PR https://github.com/docker/libcompose/pull/476
got merged.
 2017-06-16 17:55:50 +05:30
Abhishek
c8881f5aa4 update created artifacts for k8s and openshift 
update created artifacts for kubernetes and openshift so that env variables are populated in a particular order
 2017-06-16 12:35:27 +05:30
Charlie Drage
185af849e9 Update ROADMAP 
This updates the ROADMAP.md with a clear outline of the future release
of Kompose as well as the current updates / changes on each-release.
 2017-06-15 13:19:29 -04:00
Suraj Deshmukh
f823a22e64 Merge pull request #590 from surajnarwade/label-fix 
Failing when port is specified with labels
 2017-06-15 14:56:30 +05:30
Suraj Deshmukh
8e20eb7323 Merge pull request #521 from cdrage/add-build-support 
Add build and push support
 2017-06-15 14:52:45 +05:30
Suraj Narwade
209cda28d2 Failing when port is specified with labels 
Resolves #522
Kompose will give FATAL error if labels are given but ports are not defined
 2017-06-15 09:30:01 +05:30
Charlie Drage
e3b707c460 Update vendoring + add novln/docker-parser 2017-06-14 10:23:58 -04:00
Charlie Drage
e2f9084003 Adds both build and push support 
This adds support for building and pushing docker containers
when you perform either `kompose convert` or `kompose up`.

Docker Compose files who have build parameters with their respective
image and build keys will automatically be both built and pushed.
 2017-06-14 10:19:12 -04:00
Charlie Drage
49ada134ae Merge pull request #634 from cdrage/update-readme-3 
Update widgets (add godoc) as well as README
 2017-06-14 10:17:24 -04:00
Charlie Drage
449bc3a229 Update widgets (add godoc) as well as README 
Update the widgets (as well as add godoc), and update the README, making
the `kompose completion` section more concise.
 2017-06-14 10:16:31 -04:00
Abhishek
c40bb4bb3a change volume name with generated deployment file 
if volumes in docker file is defined as
      volumes:
        - .:/code
    Then the PVC created by kompose will containes .(dot) in it.
       .-persistentvolumeclaim.yaml
 2017-06-14 14:31:07 +05:30
Tomas Kral
bf20029009 Merge pull request #631 from procrypt/sort_EnvVar_struct 
Fix EnvSort struct
 2017-06-14 09:53:23 +02:00
Tomas Kral
2866792b5d Merge pull request #637 from cdrage/add-index 
Add documentation list
 2017-06-14 09:29:08 +02:00
Abhishek
719dae97e4 Environment variabled are populated in random order, causing functional tests in golang #518 to fail 2017-06-14 12:58:56 +05:30
Tomas Kral
89cf88f665 Merge pull request #638 from surajnarwade/show-diff 
Failing test will show diff
 2017-06-14 09:28:30 +02:00
Suraj Deshmukh
3be76ff32b Merge pull request #600 from cdrage/add-v3-support 
Add v3 support of Docker Compose
 2017-06-14 10:59:05 +05:30
Charlie Drage
2b58307191 Add v3 support 
This does a major refactor on the compose.go functions as well as brings
in a new era of v3 support to Kompose.

Similar to how we utilize libcompose, we utilize docker/cli's "stack
deploy" code which has a built-in v3 parser. We convert the parsed
structure to our own and then convert it to Kubernetes/OpenShift
artifacts.
 2017-06-13 09:44:48 -04:00
Suraj Narwade
883d11c049 Failing test will show diff 
If test in `make test-cmd` is failing, now it will show diff so that
it will be easy to debug.

for example,

```
===> Starting test <===
convert::expect_success_and_warning: Running: 'kompose -f /home/snarwade/go/src/github.com/kubernetes-incubator/kompose/script/test/fixtures/service-name-change/docker-compose.yml convert --stdout -j' expected_output: '/home/snarwade/go/src/github.com/kubernetes-incubator/kompose/script/test/fixtures/service-name-change/output-k8s.json' expected_warning: 'Unsupported root level volumes key - ignoring'
WARN Unsupported root level volumes key - ignoring
WARN Unsupported depends_on key - ignoring
103c103
<                     "value": "bitnami_wordpres"
---
>                     "value": "bitnami_wordpress"
FAIL: converted output does not match
```
 2017-06-13 14:20:52 +05:30
Charlie Drage
9360513a51 Add documentation list 
Adds an "index" with a list of all documentation on the README.md
 2017-06-12 10:52:07 -04:00
Tomas Kral
dbf15e2e71 Merge pull request #635 from cdrage/update-docs 
Change output examples in docs to new format
 2017-06-12 09:56:30 +02:00
Charlie Drage
f7e81ab7e0 Change output examples in docs to new format 
Changes the format from INFO to INFO <PROVIDER> in output examples.
 2017-06-09 12:42:33 -04:00
Tomas Kral
aa84680d6e Merge pull request #588 from ashetty1/kompose_labels_test 
Adding tests for kompose-specific labels and buildconfig dockerfile construct
 2017-06-08 15:09:51 +02:00
Charlie Drage
683ae91823 Update vendoring 2017-06-07 10:23:50 -04:00
Charlie Drage
f066834e3d Merge pull request #630 from cdrage/remove-jekyll-format 
Remove jekyll format from top of quickstart
 2017-06-02 11:48:35 -04:00
Charlie Drage
6d8ba322f0 Remove jekyll format from top of quickstart 
Left this in while adding docs/quickstart.md by accident
 2017-06-02 11:24:00 -04:00