diff --git a/CHANGELOG.md b/CHANGELOG.md index 325c2f231..e92e8b05d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,10 +1,35 @@ # Change Log +## [v1.6.0](https://github.com/kubernetes/kompose/tree/v1.6.0) (2017-12-11) +[Full Changelog](https://github.com/kubernetes/kompose/compare/v1.5.0...v1.6.0) + +**Closed issues:** + +- conversion metrix doc is outdated [\#873](https://github.com/kubernetes/kompose/issues/873) +- Up and convert commands are not equal in features [\#798](https://github.com/kubernetes/kompose/issues/798) +- Improve user guide [\#776](https://github.com/kubernetes/kompose/issues/776) +- Tracking card for new `deploy` keys in v3 [\#644](https://github.com/kubernetes/kompose/issues/644) +- Add `build` key support for v3 of Docker Compose [\#636](https://github.com/kubernetes/kompose/issues/636) + +**Merged pull requests:** + +- Change font to black, not lightish gray [\#888](https://github.com/kubernetes/kompose/pull/888) ([cdrage](https://github.com/cdrage)) +- Fixed conversion matrix [\#885](https://github.com/kubernetes/kompose/pull/885) ([surajnarwade](https://github.com/surajnarwade)) +- Test cross-compiling within travis [\#882](https://github.com/kubernetes/kompose/pull/882) ([cdrage](https://github.com/cdrage)) +- Fix makefile [\#881](https://github.com/kubernetes/kompose/pull/881) ([cdrage](https://github.com/cdrage)) +- Update vendoring / fix Windows builds [\#880](https://github.com/kubernetes/kompose/pull/880) ([cdrage](https://github.com/cdrage)) +- n -\> ✓ for build v3 support [\#878](https://github.com/kubernetes/kompose/pull/878) ([cdrage](https://github.com/cdrage)) +- Update conversion doc for env\_file [\#875](https://github.com/kubernetes/kompose/pull/875) ([cdrage](https://github.com/cdrage)) +- Adding `--controller` flag in `up` & `down` [\#868](https://github.com/kubernetes/kompose/pull/868) ([surajnarwade](https://github.com/surajnarwade)) +- Added support for build key in v3 [\#846](https://github.com/kubernetes/kompose/pull/846) ([surajnarwade](https://github.com/surajnarwade)) +- Fixed kompose build failure [\#837](https://github.com/kubernetes/kompose/pull/837) ([surajnarwade](https://github.com/surajnarwade)) + ## [v1.5.0](https://github.com/kubernetes/kompose/tree/v1.5.0) (2017-11-21) [Full Changelog](https://github.com/kubernetes/kompose/compare/v1.4.0...v1.5.0) **Merged pull requests:** +- 1.5.0 Release [\#874](https://github.com/kubernetes/kompose/pull/874) ([cdrage](https://github.com/cdrage)) - Set PVC volume size with kompose.volume.size [\#867](https://github.com/kubernetes/kompose/pull/867) ([abitrolly](https://github.com/abitrolly)) - architecture.md Link sources [\#866](https://github.com/kubernetes/kompose/pull/866) ([abitrolly](https://github.com/abitrolly)) - Move version information to separate file [\#864](https://github.com/kubernetes/kompose/pull/864) ([cdrage](https://github.com/cdrage)) diff --git a/README.md b/README.md index a95eb71e1..02be94106 100644 --- a/README.md +++ b/README.md @@ -44,10 +44,10 @@ __Linux and macOS:__ ```sh # Linux -curl -L https://github.com/kubernetes/kompose/releases/download/v1.5.0/kompose-linux-amd64 -o kompose +curl -L https://github.com/kubernetes/kompose/releases/download/v1.6.0/kompose-linux-amd64 -o kompose # macOS -curl -L https://github.com/kubernetes/kompose/releases/download/v1.5.0/kompose-darwin-amd64 -o kompose +curl -L https://github.com/kubernetes/kompose/releases/download/v1.6.0/kompose-darwin-amd64 -o kompose chmod +x kompose sudo mv ./kompose /usr/local/bin/kompose @@ -55,7 +55,7 @@ sudo mv ./kompose /usr/local/bin/kompose __Windows:__ -Download from [GitHub](https://github.com/kubernetes/kompose/releases/download/v1.5.0/kompose-windows-amd64.exe) and add the binary to your PATH. +Download from [GitHub](https://github.com/kubernetes/kompose/releases/download/v1.6.0/kompose-windows-amd64.exe) and add the binary to your PATH. ## Shell autocompletion diff --git a/build/VERSION b/build/VERSION index bc80560fa..dc1e644a1 100644 --- a/build/VERSION +++ b/build/VERSION @@ -1 +1 @@ -1.5.0 +1.6.0 diff --git a/docs/installation.md b/docs/installation.md index 16b8b4974..8ca4c1073 100644 --- a/docs/installation.md +++ b/docs/installation.md @@ -10,10 +10,10 @@ __Linux and macOS:__ ```sh # Linux -curl -L https://github.com/kubernetes/kompose/releases/download/v1.5.0/kompose-linux-amd64 -o kompose +curl -L https://github.com/kubernetes/kompose/releases/download/v1.6.0/kompose-linux-amd64 -o kompose # macOS -curl -L https://github.com/kubernetes/kompose/releases/download/v1.5.0/kompose-darwin-amd64 -o kompose +curl -L https://github.com/kubernetes/kompose/releases/download/v1.6.0/kompose-darwin-amd64 -o kompose chmod +x kompose sudo mv ./kompose /usr/local/bin/kompose @@ -21,7 +21,7 @@ sudo mv ./kompose /usr/local/bin/kompose __Windows:__ -Download from [GitHub](https://github.com/kubernetes/kompose/releases/download/v1.5.0/kompose-windows-amd64.exe) and add the binary to your PATH. +Download from [GitHub](https://github.com/kubernetes/kompose/releases/download/v1.6.0/kompose-windows-amd64.exe) and add the binary to your PATH. #### Nightly / master release diff --git a/docs/introduction.md b/docs/introduction.md index 8b080cbe2..69d7a1a88 100644 --- a/docs/introduction.md +++ b/docs/introduction.md @@ -47,13 +47,13 @@ Grab the Kompose binary! ```sh # Linux -curl -L https://github.com/kubernetes/kompose/releases/download/v1.5.0/kompose-linux-amd64 -o kompose +curl -L https://github.com/kubernetes/kompose/releases/download/v1.6.0/kompose-linux-amd64 -o kompose # macOS -curl -L https://github.com/kubernetes/kompose/releases/download/v1.5.0/kompose-darwin-amd64 -o kompose +curl -L https://github.com/kubernetes/kompose/releases/download/v1.6.0/kompose-darwin-amd64 -o kompose chmod +x kompose sudo mv ./kompose /usr/local/bin/kompose ``` -_Windows:_ Download from [GitHub](https://github.com/kubernetes/kompose/releases/download/v1.5.0/kompose-windows-amd64.exe) and add the binary to your PATH. +_Windows:_ Download from [GitHub](https://github.com/kubernetes/kompose/releases/download/v1.6.0/kompose-windows-amd64.exe) and add the binary to your PATH. diff --git a/pkg/version/version.go b/pkg/version/version.go index b7680d44c..c2557d1ac 100644 --- a/pkg/version/version.go +++ b/pkg/version/version.go @@ -2,7 +2,7 @@ package version var ( // VERSION is version number that wil be displayed when running ./kompose version - VERSION = "1.5.0" + VERSION = "1.6.0" // GITCOMMIT is hash of the commit that wil be displayed when running ./kompose version // this will be overwritten when running build like this: go build -ldflags="-X github.com/kubernetes/kompose/pkg/version.GITCOMMIT=$(GITCOMMIT)" // HEAD is default indicating that this was not set during build