Commit Graph
524 Commits
Author SHA1 Message Date
Tomas Kral fb042c7b20 Merge pull request #428 from surajssd/remove_unnecessary_objects
removed unnecessary objects in compose.go
2017-02-15 11:29:57 +01:00
Tomas Kral e0634302d0 Merge pull request #425 from cdrage/update-libcompose-vendoring
Update vendoring
2017-02-15 11:23:08 +01:00
Tomas Kral 7dac1a33d2 Merge pull request #413 from procrypt/add_buildConfig_to_kompose_down
add BuildConfig support to kompose down
2017-02-15 11:15:07 +01:00
Tomas Kral d20a42e447 Merge pull request #405 from procrypt/unit_tests
Unit tests for error out if controller object is specified with restart: on-failure
2017-02-14 15:36:31 +01:00
Tomas Kral 816b74811d Merge pull request #429 from surajssd/change_service_names
normalize docker-compose service that has name with underscore
2017-02-14 15:26:21 +01:00
Charlie Drage 15636ee599 Merge pull request #418 from kadel/pkgs-lazy-set
Update Makefile - lazy set for PKGS variable
2017-02-14 08:38:58 -05:00
Suraj Deshmukh 0bc24d5ca6 normalize docker-compose service that has name with underscore
kubernetes or openshift does not allow underscores in the object
names, while docker-compose does, in this commit the code has been
added to convert underscores to hypens.
2017-02-14 17:39:42 +05:30
Tomas Kral ac074e2c36 Update Makefile - lazy set for PKGS variable
Using lazy set we can run targets that are not requring PKGS without
requiring glide.
Lazy set is expended when variable is used, not when declared.
2017-02-14 10:43:30 +01:00
Suraj Deshmukh 775f5012c9 removed unnecessary objects in compose.go
In compoese.go while iterating on the ServiceConfig objects first
it's keys were pulled and then data was pulled separately which
can be done in one step by iterating on the dictionary.
2017-02-14 08:30:38 +05:30
Charlie Drage d444886e2f Update vendoring
Updates vendoring to include
https://github.com/docker/libcompose/commit/1c4bd4542afb20db0b51afd71d9ebceaf206e2dd
as well as general update to all other packages.
2017-02-13 09:59:13 -05:00
Abhishek 7a12a16dc7 Unit test for error out if controller object is specified with restart: on-failure 2017-02-13 12:41:16 +05:30
Charlie Drage f918d51cc1 Merge pull request #423 from kadel/fix-version-gitcommit
fix passing gitcommit in version output
2017-02-11 18:41:27 -05:00
Tomas Kral 18955c63d4 fix passing gitcommit in version output 2017-02-11 17:05:08 +01:00
Tomas Kral 17126345ef Merge pull request #393 from cdrage/host-container-protocol-bug
Add support for host:port:port
2017-02-10 10:51:35 +01:00
Charlie Drage 438088f37d Add support for host:port:port
This adds support for supplying for example:
"127.0.0.1:80:80/tcp" to docker-compose.yaml and converting it to it's
corresponding Kubernetes / OpenShift hostIP.

This commit also refactors the loadPorts function of compose.go

Closes https://github.com/kubernetes-incubator/kompose/issues/335
2017-02-09 12:21:17 -05:00
Suraj Deshmukh be042c7e1f Merge pull request #415 from cdrage/fix-spelling-error-down-openshift
Fix a small spelling error
2017-02-09 06:03:50 +01:00
Charlie Drage 01bf975185 Fix a small spelling error
s/service/Service/g
2017-02-08 08:55:43 -05:00
Abhishek 846812677d add buildConfig support to kompose down 2017-02-06 17:24:04 +05:30
Tomas Kral ca45137cb0 Merge pull request #396 from cdrage/update-the-release-script
Update the release script
2017-02-05 13:57:35 +01:00
Tomas Kral 2b3c37ff89 Merge pull request #394 from cdrage/remove-tcp-from-conversion
Removes the TCP output on the Kubernetes / OpenShift artifacts
2017-02-05 13:51:06 +01:00
Charlie Drage cb6c9e9755 Removes the TCP output on the Kubernetes / OpenShift artifacts
If TCP is passed in as the protocol, by default, we add TCP as the
protocol within the Kubernetes or OpenShift artifacts.

By default, TCP is already selected within Kubernetes and thus having
the TCP output is redundant.

This commit checks to see if TCP has already been selected, and if it
has, ignores adding it to the list of ports.

Closes https://github.com/kubernetes-incubator/kompose/issues/392
2017-02-01 13:33:49 -05:00
Tomas Kral a30e05fbae Merge pull request #399 from cdrage/update-installation-instructions
Update the README.md with new installation instructions
2017-01-31 18:05:47 +01:00
Charlie Drage 4b7a63a6aa Update the README.md with new installation instructions
Updates the README corresponding with binaries now in within our release
page.
2017-01-30 10:06:28 -05:00
Charlie Drage 8bf06407ba Merge pull request #368 from procrypt/yaml_and_yml
added support for docker-compose.yaml besides docker-compose.yml
2017-01-30 09:21:33 -05:00
Charlie Drage 2f05ecdcf0 Merge pull request #373 from procrypt/error_should_be_displayed
error out if controller object is specified with "restart: on-failure"
2017-01-30 09:21:20 -05:00
Abhishek 1ecd32a362 error out if controller object is specified with "restart: on-failure" 2017-01-30 17:52:36 +05:30
Tomas Kral abad9b1beb Merge pull request #397 from cdrage/update-cross-compiling-script
Updates the cross compiling commands
2017-01-28 13:04:21 +01:00
Charlie Drage b19e973549 Updates the cross compiling commands
Removed 32-Bit support, and pushes to the "bin" folder instead of
"bundles"
2017-01-27 15:57:40 -05:00
Charlie Drage 576e2c7d37 Update the release script
This updates the release script to add the changelog gem as well as
clean up some of the scripts.

This also updates the binaries being uploaded and the messages being
passed onto the tag description on GitHub.
2017-01-27 15:56:15 -05:00
Charlie Drage bf8a03f1e9 Merge pull request #395 from cdrage/release-0.2.0
0.2.0 Release
2017-01-27 15:37:05 -05:00
Charlie Drage c20ce2f088 0.2.0 Release 2017-01-27 15:36:17 -05:00
Tomas Kral 3f10691838 Merge pull request #387 from cdrage/warn-if-passed-z-to-volume
Ignores :z or :Z when passed in as a volume string
2017-01-25 13:56:40 +01:00
Tomas Kral 5383914f30 Merge pull request #157 from sebgoa/headless
Handle Headless Services when no ports are present
2017-01-25 13:29:56 +01:00
Tomas Kral 90febe7f7f Change warning to debug for services without ports. 2017-01-25 13:20:40 +01:00
Tomas Kral 8f2dd5b03b Test Headless Services 2017-01-25 11:28:29 +01:00
Tomas Kral 5a62864ef9 Handle Headless Services for OpenShift 2017-01-25 11:28:29 +01:00
sebgoa 3193ac3bd7 Handle Headless Services when no ports are present 2017-01-25 11:28:29 +01:00
Tomas Kral 001e19c4b3 Merge pull request #385 from kadel/test-in-docker
Container for running tests and Makefile cleanup
2017-01-24 12:18:29 +01:00
Tomas Kral 55a2e60a30 Merge pull request #389 from cdrage/update-docs
Update documentation removing [0000] timestamp outputs
2017-01-23 16:22:29 +01:00
Tomas Kral 0b1b7f3c35 Rename some make targests: test->test-container test-all->test 2017-01-23 15:05:25 +01:00
Charlie Drage 06a63d6c81 Update documentation removing [0000] timestamp outputs
Updates the README as well as user_guide.md to remove the timestamp
outputs (as well as the random : that was added to the README.md)
2017-01-23 09:00:37 -05:00
Tomas Kral 20b844d6e9 Clean up Makefile and scripts in scripts dir.
If command is simple command call it from Makefile,
there is no need to have them in separate shell scripts.
2017-01-23 11:49:25 +01:00
Tomas Kral f530f99f02 Fix CreateLocalGitDirectory for tests.
If you didn't setup user.email and user.name `git commit` fails.
This configures user.email and user.name for newly created temporary git
repo.
2017-01-23 11:49:25 +01:00
Tomas Kral f68be75d60 Add make rules for building and running test image 2017-01-23 11:49:24 +01:00
Tomas Kral c8c2e8b7f6 Dockerfile for running tests 2017-01-23 11:49:24 +01:00
Abhishek 96a0572f50 added support for docker-compose.yaml besides docker-compose.yml 2017-01-23 13:30:33 +05:30
Charlie Drage b8006d0620 Ignores :z or :Z when passed in as a volume string
We're going to ignore :z / :Z for labeling aka SELinux when being passed
in via Docker Compose.

Closes https://github.com/kubernetes-incubator/kompose/issues/176
2017-01-20 15:20:41 -05:00
Tomas Kral 99c1a79fbd Merge pull request #383 from cdrage/clean-up-logging
Update logging for logrus
2017-01-19 18:37:25 +01:00
Charlie Drage 94a9f88521 Merge pull request #370 from cdrage/add-autocompletion
Add bash auto completion support
2017-01-19 10:04:56 -05:00
Suraj Deshmukh daf7c995ba Merge pull request #380 from surajssd/fix_test_user_warnings
Fixed warnings related to user type in tests
2017-01-18 20:22:59 +05:30