Commit Graph

1106 Commits

Author SHA1 Message Date
Tuna
0bad1674b5 make --file as global flag 2016-09-06 22:36:12 +07:00
Tuna
0c33e7e965 Use libcompose project.Context{} instead of docker.Context{}
Fix #134
2016-09-05 23:24:24 +07:00
Tomas Kral
b2add4163f Merge pull request #127 from kadel/entrypoint
docker-compose - Entrypoint support
2016-09-05 10:50:20 +02:00
Tomas Kral
7e91770dfe Merge pull request #126 from kadel/fix-openshift-output
Fix conversion to OpenShift (invalid DeploymentConfig)
2016-09-05 10:49:36 +02:00
Tomas Kral
e127ce17bd
test for entrypoint and command 2016-09-05 10:40:50 +02:00
runseb
7623f81387 Merge pull request #143 from luebken/luebken-fixed-link-readme
Update README.md
2016-09-05 09:10:10 +02:00
runseb
191ecfad3b Merge pull request #141 from ngtuna/userguide
update user guide: add `kompose up`, `kompose down`
2016-09-05 09:09:56 +02:00
Matthias Lübken
c500df41b7 Update README.md
fixed link
2016-09-05 08:55:31 +02:00
Tuna
9b44c675b0 update user guide: kompose up, kompose down 2016-09-03 15:50:55 +07:00
Tomas Kral
cc4f162cea
Remove Entrypoint from Kompose object
We had Command and Args together with Entrypoint in Kompose object.
This doesn't make much sense, as Entrypoint and Command are same thing.
I've removed Entrypoint from Kompose object in favor of Command to keep
same naming convensions as in Kubernetes.

Entrypoint from docker-compose.yml is now saved to Command and Command
is saved to Args (http://kubernetes.io/docs/user-guide/containers/).

docker-compose.yml | Kompose object
-------------------|---------------
  Entrypoint       |    Command
   Command         |     Args
2016-09-02 10:10:34 +02:00
Tomas Kral
8590a98504
docker-compose - fix Command and add Entrypoint support 2016-09-02 10:10:34 +02:00
Tomas Kral
e2da0f089a
Make sure that Services are first in the List
Sorts objects in Transform function, this should
make sure that Services are first everywhere as
long as we keep order in the slice that Transform returns.

fixes #130
2016-09-02 10:09:00 +02:00
Tomas Kral
b24556e9d5
fixes #124
add missing conversion to versioned object when saving to files
2016-09-02 09:49:11 +02:00
Tuna
0da484a974 Merge pull request #113 from ngtuna/kompose-delete
support kompose down subcommand
2016-09-02 10:18:24 +07:00
Tuna
f2769066ca only print warning and keep deleting objects 2016-09-02 10:10:48 +07:00
Tuna
aafba39a42 use reapers to delete objects 2016-09-02 10:10:48 +07:00
Tuna
e08ab06f2c support kompose down 2016-09-02 10:10:48 +07:00
Tuna
166fe4cd00 Merge pull request #136 from runseb/komposeup
improve messages of kompose up
2016-09-01 17:56:31 +07:00
Tuna
5d37303ea5 Merge pull request #135 from runseb/examples
New guestbook example
2016-09-01 17:55:41 +07:00
runseb
aa71e96175 improve messages of kompose up 2016-08-31 15:54:54 +02:00
runseb
22c65c689c New guestbook example 2016-08-31 15:35:39 +02:00
runseb
9415a408df Merge pull request #132 from runseb/docs
Moves examples to docs/user-guide and adds basic roadmap to main readme
2016-08-30 17:34:45 +02:00
runseb
672a2f0638 Moves examples to docs/user-guide and adds basic roadmap to main readme 2016-08-30 16:10:08 +02:00
runseb
f5e84a4af3 Merge pull request #128 from janetkuo/add-owners
Add more owners
2016-08-29 21:07:09 +02:00
Janet Kuo
58b622037b Add more owners 2016-08-29 11:58:17 -07:00
Tuna
34e97abd05 Merge pull request #123 from ngtuna/clean-code
clean code
2016-08-25 17:13:18 +07:00
Tuna
82ae7fab78 clean code 2016-08-25 00:34:54 +07:00
Tuna
3f94d778d7 Merge pull request #122 from ngtuna/update-objects
fix #121: update all objects, even when port is missing
2016-08-24 15:04:27 +07:00
Janet Kuo
9c03ae9cf4 Merge pull request #118 from janetkuo/remove-hostpath
Remove hostPath and print warnings
2016-08-23 22:19:04 -07:00
Janet Kuo
b4dc8d2846 Merge pull request #120 from janetkuo/architecture-md
Update architecture doc format
2016-08-23 11:07:18 -07:00
Janet Kuo
4d0960fea8 Merge pull request #119 from janetkuo/improve-err-message
Improve error message for invalid port
2016-08-23 11:07:08 -07:00
Tuna
c038b184f1 follow-up: update for openshift 2016-08-24 00:34:16 +07:00
Tuna
4f36dca026 fix #121: update all objects, even when port is missing 2016-08-24 00:07:38 +07:00
Tomas Kral
6cbdec444b Merge pull request #112 from kadel/libcompose-v0.3.0
update Libcompose to v0.3.0
2016-08-23 10:57:29 +02:00
Janet Kuo
3809b2b804 Update architecture doc format 2016-08-22 15:27:13 -07:00
Janet Kuo
332c5b2c35 Improve error message for invalid port 2016-08-22 14:26:23 -07:00
Janet Kuo
46594698db Remove hostPath and print warnings 2016-08-22 13:25:58 -07:00
Tomas Kral
b3017199b6
some items in libcompose ServiceConfig changed type 2016-08-22 10:51:38 +02:00
Tomas Kral
e341adce0e
bump(github.com/docker/libcompose) v0.3.0 2016-08-22 10:51:22 +02:00
Suraj Deshmukh
223b4f37fa Merge pull request #115 from surajssd/create-objects-func
Reuse creation of controller object code
2016-08-18 22:04:00 +05:30
Suraj Deshmukh
6ce3c92937 Reuse creation of controller object code
The repated controller creation code has been removed. And
aggregated it into a single function, that Kubernetes and OpenShift
providers' Transform code can call.
2016-08-18 14:18:12 +05:30
Suraj Deshmukh
d8c2b7cfd3 Merge pull request #114 from surajssd/remove-unused-svcnames
Removed unwanted svcnames list
2016-08-18 14:02:03 +05:30
Suraj Deshmukh
a03b6af50a Removed unwanted svcnames list
Transform function from both the providers has some unused
data structure so removed it.
2016-08-18 12:21:38 +05:30
Suraj Deshmukh
3e5ade4f6c Merge pull request #108 from surajssd/create-service
Create service function in kubernetes utils
2016-08-18 11:23:15 +05:30
Suraj Deshmukh
cc9531abaf Merge pull request #110 from surajssd/tests-check
Fix output comparison for cmd tests
2016-08-17 23:28:38 +05:30
Suraj Deshmukh
36aa6d8c3b Fix output comparison for cmd tests
Now check on true as comparison output, then PASS,
if anything else just fail on it. This avoids all the
false positives.
2016-08-17 22:09:15 +05:30
Suraj Deshmukh
163a06df27 Create service function in kubernetes utils
This function can be used in both openshift and kubernetes and all the logic
of creating service can be kept in this function.
2016-08-17 09:54:17 +05:30
Janet Kuo
e36f38446b Merge pull request #105 from janetkuo/convert-container-name-args
Support container name and args in kompose convert
2016-08-16 10:54:25 -07:00
Janet Kuo
950d5f6419 Merge pull request #106 from janetkuo/convert-unit-test-2
Add more unit tests for Transform
2016-08-16 10:53:52 -07:00
Janet Kuo
c18288a023 Add more unit tests for Transform 2016-08-16 10:43:44 -07:00