Commit Graph

1574 Commits

Author SHA1 Message Date
Charlie Drage
c01bcce02e Merge pull request #542 from cdrage/release-0.5.0
0.5.0 release
2017-04-04 12:52:17 -04:00
Charlie Drage
3c870ffa86 0.5.0 Release 2017-04-04 12:24:27 -04:00
Charlie Drage
44a7f8dd9a Merge pull request #540 from cdrage/add-arm-to-release
Add ARM to make cross.
2017-04-04 12:16:34 -04:00
Charlie Drage
fed0be319a Add ARM to make cross.
This adds a linux/arm build to Makefile which will be included in the
release.sh script.
2017-04-04 10:13:07 -04:00
Charlie Drage
ee44a2630f Move docker-compose.yml test file to tests
Moves a file that was incorrectly being used from examples to
script/test/fixtures.
2017-04-04 09:09:12 -04:00
Suraj Narwade
3a086b4f2f Removed unused functions
Fixes #534 by removing functions askForConfirmation in app.go, TransformData and RandStringBytes in utils.go
2017-04-04 11:24:35 +05:30
Charlie Drage
ce26a75d69 Only ignore the docker-compose yaml file in the root directory
Woops! It was ignoring all of them in the directory. We should only be
avoiding the root dir docker-compose files!
2017-04-03 14:49:18 -04:00
Tomas Kral
a24084d2a6 Merge pull request #509 from procrypt/propagate_underscore
Propagate underscore into valid name
2017-04-03 19:43:22 +02:00
Tomas Kral
d21c240e3e
skip to next object when there is an error with deletion 2017-04-03 18:19:33 +02:00
Suraj Narwade
da6a2e946a
Kompose will keep trying its job
fixes #270

all errors in undeploy method(both kubernetes and openshift) are appended in a slice of errors,
and then it will be returned after successful deletion of all components.
2017-04-03 18:19:06 +02:00
Tomas Kral
dccd89aeeb Merge pull request #535 from kubernetes-incubator/revert-477-keep_trying_job
Revert "Kompose will keep trying its job"
2017-04-03 18:07:05 +02:00
Charlie Drage
8e0de50d38 Revert "Kompose will keep trying its job" 2017-04-03 11:52:01 -04:00
Charlie Drage
14a5ed38cf Merge pull request #477 from surajnarwade/keep_trying_job
Kompose will keep trying its job
2017-04-03 11:25:11 -04:00
Tomas Kral
1f0ecbdc6e Merge pull request #525 from cdrage/typo-readme
Fix typo in tarball link in readme
2017-04-03 14:58:49 +02:00
Tomas Kral
f5e3985405 Merge pull request #524 from cdrage/fix-typo
Fix typo in replicas and organize flags
2017-04-03 14:58:19 +02:00
Abhishek
6e0b934f77 Propagate underscores into valid names
Now we can provide service name with "_" in docker-compose files and they will by converted as "-" in the generated artifacts by kompose eg, if the service name in docker-compose file is "foo_bar" then it will be converted into "foo-bar" in the generated artifacts
2017-04-03 13:06:33 +05:30
Charlie Drage
b0c4e23256 Merge pull request #529 from cdrage/fix-logrus-bug
Update vendoring + fix issue with timestamps being added to log
2017-03-31 14:41:54 -04:00
Charlie Drage
ecea95a2a0 Update vendoring + fix issue with timestamps being added to log
As per the vendoring here:
e9544ca894
for some odd issue, text_formatter.go in the logrus package was updated
to an older file.

This commit updates the vendoring as well as specifies a specific
version for logrus to be used.

Closes + fixes
https://github.com/kubernetes-incubator/kompose/issues/532
2017-03-31 13:58:39 -04:00
Suraj Narwade
80b15c1d95 Kompose will keep trying its job
fixes #270

all errors in undeploy method(both kubernetes and openshift) are appended in a slice of errors,
and then it will be returned after successful deletion of all components.
2017-03-31 14:14:14 +05:30
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