Commit Graph

705 Commits

Author SHA1 Message Date
Suraj Deshmukh
eead1cb8f7 Merge pull request #526 from surajnarwade/fix_test
Fixed functional tests
2017-03-30 15:40:15 +05:30
Suraj Narwade
df014bebd6 Fixed functional tests
Fixes #431

fixed commands where output showing `command not found` and k8s output
added for restart-options example.
2017-03-30 15:06:57 +05:30
Charlie Drage
e2e7e8391d Fix typo in tarball link in readme
Fixes the link on the README.md related to the tarball archive
2017-03-29 09:31:38 -04:00
Charlie Drage
c74d8a5981 Fix typo in replicas and organize flags
Fixes a typo in the `--replicas` command as well as changes up some
grammar and moves the 'markashidden' flag values elsewhere.
2017-03-29 09:24:58 -04:00
Charlie Drage
12a6a0b1f1 Remove unused parameters from Kompose down
Remove --replicas and --emptyvols from Kompose down
2017-03-29 09:21:15 -04:00
Tomas Kral
309d5a9f7f Merge pull request #516 from cdrage/ignore-docker-compose
Ignore Docker Compose files in the root directory
2017-03-28 22:03:47 +02:00
Tomas Kral
41be9467fa Merge pull request #515 from cdrage/fix-spelling-error
Fix the DAB spelling error
2017-03-28 22:03:04 +02:00
Suraj Deshmukh
1669e2e87b Merge pull request #520 from surajnarwade/minor_fix
Removing unused variable from convert.go
2017-03-28 18:13:00 +05:30
Suraj Narwade
a7e459ce05 Removing unused variable from convert.go
Fixes #513
removed `ConvertSource` and `ConvertBuildConfig`, since they are no longer used.
2017-03-28 16:18:02 +05:30
Charlie Drage
41976a3bf2 Ignore Docker Compose files in the root directory
When developing Kompose, it's common to have the Docker Compose file in
the root directory.

Adding it to gitignore ignores it for any changes that could be
committed / pushed by accident.
2017-03-27 11:17:48 -04:00
Charlie Drage
1298b57620 Fix the DAB spelling error
It's Distributed Application Bundle (DAB).
2017-03-27 10:48:13 -04:00
Tomas Kral
99f70109b7 Merge pull request #512 from cdrage/fix-image
Fixes image (uses / to get the root dir)
2017-03-27 10:31:58 +02:00
Charlie Drage
49137fbfb6 Fixes image (uses / to get the root dir)
Fixes the image when syncing between docs. Adds a '/'.
2017-03-24 15:15:10 -04:00
Tomas Kral
f8da61436e
add missing 'io.kompose.service' label to Route and Ingress
This was caussing 'kompose down' not to delete Route and Ingress
2017-03-24 14:42:53 +01:00
Tomas Kral
3c3ae9807a Merge pull request #483 from procrypt/empty_vols
delete objects based on label
2017-03-24 12:11:29 +01:00
Abhishek
d212758856 vendor update 2017-03-24 00:31:39 +05:30
Abhishek
55ad1d9b1f delete objects based on label
This PR uses the "SelectorFromSet()" function which takes alabel or
selector as an argument returns all the object that uses that label or
selector. Once we get the object that uses a particular label we can
further do the delete operation on them. This is similar to "kubectl
delete <object> --selector=<key>=<value>". Also the label has been
modified from service to io.kompose.service.
2017-03-24 00:31:33 +05:30
Tomas Kral
362d9f274c Merge pull request #508 from cdrage/fix-bug-sync-docs
Update minor bug in syncing files
2017-03-23 18:02:44 +01:00
Charlie Drage
5df9f210bf Update minor bug in syncing files
Didn't catch this when testing all the pages (saw that setup and index
worked but not others).

Removes '.md' from the permalink.
2017-03-23 12:47:13 -04:00
Charlie Drage
e888ed4618 Merge pull request #500 from cdrage/sync-docs
Sync changes from master to gh-pages on each merge request
2017-03-23 11:52:40 -04:00
Charlie Drage
cf6df7190c Sync changes from master to gh-pages on each merge request
This adds the functionality for Travis to sync with http://kompose.io in
regards to "syncing" the docs directory in master and the docs within
gh-pages.

Two things are added:
  script/sync-docs/sh
  script/deploy_key.enc

The encrypted key follows the conventions here:
https://gist.github.com/domenic/ec8b0fc8ab45f39403dd
and the functionality of running: `travis encrypt-file encrypt_key`

The script is ran each-time a PR is merged (and only if it's
sucessful!) as per the modifications in `.travis.yml`.

Thus each time we make a change in master, there's no need to open up
another PR for syncing the changes with `gh-pages`.
2017-03-23 10:58:19 -04:00
Tomas Kral
7c60edeb67 Merge pull request #507 from cdrage/add-targz-to-readme
Update the readme with tarball and installation instructions
2017-03-23 15:41:11 +01:00
Charlie Drage
8d63c6413d Update the readme with tarball and installation instructions
Updates the readme to reflect that we now have a tarball as well as
latest development instructions on prefering the binary installation
over `go get`.
2017-03-23 10:13:52 -04:00
Charlie Drage
3ac6d9aa58 Merge pull request #499 from surajnarwade/add_dockerfile_support
Added dockerfile key support
2017-03-22 10:17:10 -04:00
Suraj Narwade
ec897ef50f Added dockerfile key support
Fixes #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
...
...
```
2017-03-22 17:49:26 +05:30
Tomas Kral
fba87faa16 Merge pull request #504 from surajnarwade/minor_fix
Removed Duplicate line(build) from compose.go
2017-03-22 13:08:08 +01:00
Tomas Kral
5ae5652416 Merge pull request #503 from cdrage/update-gitignore-2
Ignore the /bin folder
2017-03-22 13:06:51 +01:00
Tomas Kral
d5254b3b19 Merge pull request #495 from cdrage/add-fedora-packaging
Add rpm packaging
2017-03-22 12:57:10 +01:00
Tomas Kral
c0e2d5a271 Merge pull request #494 from cdrage/remove-extend-from-unused
Remove extend from unused keys, add to conversion doc
2017-03-22 12:56:26 +01:00
Suraj Narwade
73d9970197 Removed Duplicate line(build) from compose.go 2017-03-22 13:06:50 +05:30
Charlie Drage
aa3913f649 Ignore the /bin folder
Bin folder is used for binary generation. Ignore it.
2017-03-21 15:31:49 -04:00
Charlie Drage
4e3300c642 Merge pull request #502 from cdrage/release-0.4.0
0.4.0 release
2017-03-21 14:55:23 -04:00
Charlie Drage
d4fd8cbebb 0.4.0 Release 2017-03-21 14:48:27 -04:00
Charlie Drage
123b3144d2 Merge pull request #498 from kadel/lint-no-fail
do not fail if there is a golint violation
2017-03-17 13:25:26 -04:00
Charlie Drage
30ead55071 Merge pull request #497 from kadel/update-travis
travis-ci: send report to coveralls in after_success section
2017-03-17 13:24:47 -04:00
Tomas Kral
3411f3c94b
do not fail if there is a golint violation
golint output is just suggestion. Just show ouptut, but don't fail.
This also remove unnecessary bash script that is no longer needed.
2017-03-17 17:09:49 +01:00
Charlie Drage
abc500f0bb Add rpm packaging
This adds rpm packaging for building on Fedora + CentOS + deploying to
Koji.

I've gone ahead and updates notes.txt to a README.md to better reflect
how to build.

This is copied from:
https://src.fedoraproject.org/cgit/rpms/kompose.git
and added as a submodule.

Closes https://github.com/kubernetes-incubator/kompose/issues/481

Ping @surajssd @dustymabe
2017-03-17 10:55:21 -04:00
Tomas Kral
d24b86ad85
send report to coveralls in after_success section
Connection to coveralls.io sometimes fails and its marking tests as fail
even then are OK. Exit code from after_success do not affects build
result.
2017-03-17 15:45:37 +01:00
Tomas Kral
752b203089 Merge pull request #484 from surajnarwade/add_tmpfs_support
Added support for tmpfs
2017-03-16 18:07:49 +01:00
Suraj Narwade
494133484c Added support for tmpfs
fixes #436
This commit will add support for tmpfs, configEmptyVolumeSource
function is being modified as it have to work in two ways now.
(For emptyvols and tmpfs)
Added unit test for tmpfs too.
2017-03-16 22:14:39 +05:30
Charlie Drage
54f133958f Merge pull request #462 from containscafeine/improve_error_handling
Improve error handling, fix #416
2017-03-15 13:11:26 -04:00
Tomas Kral
fac6fd8122 Merge pull request #492 from kadel/brew-install
Add install instruction for MacOS X (using brew)
2017-03-15 17:21:49 +01:00
Shubham Minglani
e9544ca894 add github.com/pkg/errors to glide and vendor
This adds github.com/pkg/errors to glide.yaml followed
by glide and glide-vc commands. The github.com/pkg/errors
package is currently required mainly for the errors.Wrap()
and errors.New() methods, since this lets us to annotate the
errors while passing the error message up the call stack.
2017-03-15 19:41:28 +05:30
Charlie Drage
482c5520c9 Remove extend from unused keys, add to conversion doc
This removes the "unsupported" extends from the list (since we actually
support) as well as add a clarificiation on the conversion.md document.

Closes https://github.com/kubernetes-incubator/kompose/issues/475
Closes https://github.com/kubernetes-incubator/kompose/issues/493
2017-03-15 09:28:58 -04:00
Shubham Minglani
5cb598fa5b return errors instead of logrus.Fatal calls
This commit refactors the code to remove more or less
all occurences of logrus.Fatalf() from the code under
pkg/ except for app.go where all the errors are being
handled currently.

This is being done since random logrus.Fatalf() calls
all around the code was making handling the errors,
unit testing and troubleshooting a bit more painful.

logrus.Fatalf() calls are either replaced by
return errors.New("new error")
or
return errors.Wrap(err, "annonate error")
calls, and the function signatures are accordingly
changed to accomodate the new return values.

The unit tests which previously used to check
if logrus.Fatalf() calls worked fine have also
been fixed to only check for errors now.

Fixes #416
2017-03-15 13:30:21 +05:30
Tomas Kral
63e2023d3d
README.md - add brew install instruction for MacOS X 2017-03-14 18:22:03 +01:00
Tomas Kral
d05e8c522a Merge pull request #490 from cdrage/update-libcompose
Update vendoring
2017-03-14 18:14:38 +01:00
Tomas Kral
c6c6d6a509 Merge pull request #491 from cdrage/update-conversion-docs
Add that we support volumes_from
2017-03-14 17:18:24 +01:00
Charlie Drage
28260fb6a6 Add that we support volumes_from
Adds a note to the conversion doc that we support volumes_from.

Closes https://github.com/kubernetes-incubator/kompose/issues/476
2017-03-14 11:30:22 -04:00
Charlie Drage
e30b5c0bc5 Update vendoring
This updates the libcompose vendoring as well as a general update to
vendoring (adds the latest git commit of libcompose).

Closes https://github.com/kubernetes-incubator/kompose/issues/426
Closes https://github.com/kubernetes-incubator/kompose/issues/471
2017-03-14 11:20:38 -04:00