Commit Graph
95 Commits
Author SHA1 Message Date
Tomas Kral abf81926c0 Merge pull request #460 from ashetty1/openshift_up_down_test
Adding kompose up/down tests for openshift
2017-05-02 13:35:55 +02:00
Tomas Kral a2cff3e11a Merge pull request #583 from cdrage/update-it-again
Release script binary upload bug
2017-05-02 13:02:47 +02:00
Tomas Kral 0d3a7084c2 Merge pull request #567 from cdrage/add-spacing-to-table
Adds spacing to table
2017-04-28 11:44:40 +02:00
Tomas Kral 760d47b022 Merge pull request #579 from cdrage/update-roadmap-3
Update PR for ROADMAP
2017-04-27 16:18:47 +02:00
Tomas Kral 3dd41ecad7 Merge pull request #517 from procrypt/new_namespace
Added support for different namespaces
2017-04-12 15:40:34 +02:00
Tomas Kral cba4c569a3 Merge pull request #552 from cdrage/fix-headers-docs
Fixes the headers of the docs
2017-04-11 11:26:48 +02:00
Tomas Kral 1c789c5a93 Merge pull request #523 from cdrage/remove-unused-flags-from-down
Remove unused parameters from Kompose down
2017-04-11 10:20:23 +02:00
Tomas Kral 8f435b1f05 Merge pull request #533 from cdrage/woops-gitignore
Only ignore the docker-compose yaml file in the root directory
2017-04-11 10:05:04 +02:00
Tomas Kral 8c817089ce Merge pull request #546 from cdrage/add-setup-doc
Add setup.md
2017-04-10 17:04:25 +02:00
Tomas Kral d933317e04 Merge pull request #527 from cdrage/update-authors-and-contributing
Update contributing doc for reviewing, update owners file
2017-04-06 19:55:25 +02:00
Tomas Kral 012aa922eb Merge pull request #539 from surajnarwade/remove_unused_functions
Removed unused functions
2017-04-06 18:33:18 +02: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 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
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
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
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
Tomas Kral 3c3ae9807a Merge pull request #483 from procrypt/empty_vols
delete objects based on label
2017-03-24 12:11:29 +01:00
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
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
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
Tomas Kral 752b203089 Merge pull request #484 from surajnarwade/add_tmpfs_support
Added support for tmpfs
2017-03-16 18:07:49 +01: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
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
Tomas Kral c1b3a54bf9 Merge pull request #485 from cdrage/update-link-to-conversion-doc
Update the link to the conversion doc
2017-03-14 14:11:26 +01:00
Tomas Kral 488f34bb1a Merge pull request #488 from cdrage/add-release-notes
Add three-week cycle comment to README
2017-03-14 13:50:16 +01:00
Tomas Kral e631960894 Merge pull request #465 from cdrage/update-release-script-resync
Update release script
2017-03-03 17:46:26 +01:00
Tomas Kral 96cfc3c506 Merge pull request #468 from kadel/cap
Add cap_add and cap_drop to unsupported keys
2017-03-02 19:21:29 +01:00
Tomas Kral de797643ae Merge pull request #466 from cdrage/update-user-guide
Minor fix on user guide
2017-03-02 15:49:42 +01:00
Tomas Kral fe632d9d39 Merge pull request #459 from procrypt/unsupported_keys
unsupported keys
2017-03-02 13:57:46 +01:00
Tomas Kral 84dba65a2d Merge pull request #455 from cdrage/update-logrus
Clean up logrus
2017-03-01 15:18:24 +01:00
Tomas Kral e555e74a1d Merge pull request #453 from cdrage/update-readme-with-new-go-update
Update the README with -u in go get
2017-02-27 16:04:30 +01:00
Tomas Kral 34884169af Merge pull request #414 from cdrage/add-mem-limit
Adds mem_limit support for conversion
2017-02-22 16:05:46 +01:00
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
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
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
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
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
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 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 99c1a79fbd Merge pull request #383 from cdrage/clean-up-logging
Update logging for logrus
2017-01-19 18:37:25 +01:00
Tomas Kral d59643b652 Merge pull request #359 from kubernetes-incubator/kadel-patch-2
update roadmap
2017-01-12 09:49:05 +01:00
Tomas Kral df335234bd update roadmap
info about monthly releases
2017-01-12 09:47:27 +01:00
Tomas Kral b7a8c5702d Merge pull request #363 from ngtuna/up-down-pod
add deploy/undeploy pod only
2017-01-11 16:57:42 +01:00
Tomas Kral 7dbf00c18e Merge pull request #371 from surajssd/update_pod_example
updated pods example in user guide
2017-01-10 15:36:32 +01:00
Tomas Kral d926cff57a Merge pull request #362 from surajssd/cmd_tests_fix
Fixing functional tests for checking generated artifacts
2017-01-06 12:20:29 +01:00
Tomas Kral 6e260bab0b Merge pull request #341 from surajssd/build_instructions_update
updated dev docs with latest instructions
2017-01-04 19:08:12 +01:00
Tomas Kral 65e19e3105 Merge pull request #333 from cdrage/namespace-bug
Fix container_name incorrectly being generated
2016-12-12 18:17:52 +01:00
Tomas Kral 04a3131834 Merge pull request #332 from kubernetes-incubator/kadel-patch-1
Update RPM instalaion instructions in README.md
2016-12-08 14:48:49 +01:00
Tomas Kral 25200cf418 Update README.md 2016-12-07 20:20:20 +01:00
Tomas Kral 862419b836 Merge pull request #329 from kadel/coveralls-fix
Report code coverage to coveralls
2016-12-07 17:46:22 +01:00
Tomas Kral e62e070738 Merge pull request #322 from surajssd/install_rpm
Added installation instructions of rpm
2016-12-06 11:01:27 +01:00
Tomas Kral c43a973453 Merge pull request #321 from surajssd/intellij-gitignore
IntelliJ IDE .gitignore
2016-12-01 11:44:07 +01:00
Tomas Kral 6092df4364 Merge pull request #245 from kadel/user
Add support for user directive
2016-11-25 10:28:17 +01:00
Tomas Kral b0514bd2dd Merge pull request #259 from kadel/lint-and-vet
Add `go vet`,  and `gofmt` tests.
2016-11-25 09:49:15 +01:00
Tomas Kral 763cbc0276 Merge pull request #284 from cdrage/reorg-readme
Organize the README.
2016-11-23 10:28:49 +01:00
Tomas Kral 6033025c05 Merge pull request #289 from cdrage/change-provider-error-output
Clean up the logging output for unknown provider
2016-11-22 16:08:27 +01:00
Tomas Kral 6ceca2462e Merge pull request #305 from cdrage/remove-trailing-slash
Remove trailing slash
2016-11-22 11:53:22 +01:00
Tomas Kral 04b1d004b4 Merge pull request #277 from surajssd/generic-service-type
Generic service type handler for kompose
2016-11-21 13:53:12 +01:00
Tomas Kral bc8536d8a4 Merge pull request #271 from ngtuna/gitlab-example
Update docker-gitlab example
2016-11-21 12:04:10 +01:00
Tomas Kral c1868b47ef Merge pull request #282 from cdrage/update-readme
Update README since Kompose is now Go gettable
2016-11-21 12:00:25 +01:00
Tomas Kral 7ff80f2550 Merge pull request #269 from ngtuna/emptyvols
correct display when using --emptyvols
2016-11-21 11:59:17 +01:00
Tomas Kral a3495b1d6b Merge pull request #246 from cdrage/add-tests-docs-service-types
Tests for CreateService and annotations
2016-11-01 15:57:06 +01:00
Tomas Kral 52b5235d36 Merge pull request #261 from cdrage/add-unit-test-coverage-command
Modify command in initializing unit tests
2016-11-01 10:43:49 +01:00
Tomas Kral 47cd5cd4b2 Merge pull request #257 from ngtuna/fix-binary-cross
binary-cross build
2016-10-31 11:18:23 +01:00
Tomas Kral 80c1323448 Merge pull request #252 from cdrage/label-docs
Add documentation on recent labels feature
2016-10-30 17:56:55 +02:00
Tomas Kral d9c5de661a Merge pull request #248 from dustymabe/dusty-empty-vols
Adding support for choosing empty volumes
2016-10-30 17:49:50 +02:00
Tomas Kral a3643a55ac Merge pull request #243 from cdrage/add-vim-gitignore
Add VIM git ignore information
2016-10-27 18:03:36 +02:00
Tomas Kral 1280b9abcb Merge pull request #189 from procrypt/labels
Configure service types
2016-10-27 12:25:29 +02:00
Tomas Kral 414645d73c Merge pull request #211 from procrypt/unknown_args
remove unknown args and added tests
2016-10-26 14:37:08 +02:00
Tomas Kral d9899b788d Merge pull request #200 from kadel/openshift-up-new
Kompose up for OpenShift
2016-10-18 17:38:58 +02:00
Tomas Kral 51ef336ab0 Merge pull request #199 from kadel/fix-deps
fix golang.org/x/net vendoring
2016-10-11 13:58:20 +02:00
Tomas Kral 21cc608eec Merge pull request #166 from kadel/multiprovider-up
Prepare up/down for other providers
2016-09-28 15:32:06 +02:00
Tomas Kral 55f6e75573 Merge pull request #160 from kadel/add-imagestream
OpenShift - generate DeploymentConfig with ImageStream
2016-09-28 15:31:39 +02:00
Tomas Kral c593ff8e44 Merge pull request #168 from kadel/global-dab
Make --dab/--bundle global flag
2016-09-26 11:19:43 +02:00
Tomas Kral 9dbc5c0b46 Merge pull request #164 from kadel/up-in-namespace
kompose up - Get namespace from kubeconfig
2016-09-26 11:17:24 +02:00
Tomas Kral fa46376dff Merge pull request #159 from kadel/fix-port-parsing
Add port protocol handing for docker-compose.
2016-09-22 09:34:21 +02: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 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
Tomas Kral e7dfff5252 Merge pull request #93 from kadel/travis-tests
Run tests on travis-ci
2016-08-11 17:08:29 +02:00
Tomas Kral 0b2426dbcf Merge pull request #66 from skippbox/kadel-patch-1
Development Guide: use script/godep-restore.sh
2016-07-28 10:59:28 +02:00
Tomas Kral 6991b811e9 Development Guide: use script/godep-restore.sh 2016-07-26 12:12:05 +02:00