Merge pull request #106 from Metaswitch/release-0.6.0

Release 0.6.0

CHANGELOG.md

@@ -4,12 +4,21 @@ All notable changes to this project will be documented in this file.
 
 This file's format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/). The
-version number is tracked in the file `VERSION`.
+version number is tracked in the file `Cargo.toml`.
 
 Contact: See Cargo.toml authors
 Status: Available for use
 
 ## [Unreleased]
+
+### Changed
+
+### Added
+
+### Fixed
+
+## [0.6.0] - 2020-07-15
+
 ### Changed
 - Cleanup of resolution of working directory to use proper path types - PATCH
 - Cleanup and improve handling of user uid and gid - PATCH
@@ -22,6 +31,7 @@ Status: Available for use
   + See `floki completion --help`
 
 ## [0.5.0] - 2020-05-05
+
 ### Changed
 - Change `after_deploy.sh` into a separate stage as `after_deploy:` scripts run after each `deploy:` step.
 - Resolve Dockerfile path and Docker context correctly when running `floki` from a subdirectory of the directory containing `floki.yaml` - PATCH
@@ -38,11 +48,13 @@ Status: Available for use
 - Allow the docker-in-docker image to be specified in configuration - MINOR
 
 ## [0.4.3] - 2019-12-02
+
 ### Changed
 
 ### Added
 
 ## [0.4.2] - 2019-12-02
+
 ### Changed
 
 ### Added
@@ -51,12 +63,14 @@ Status: Available for use
 - Fix up build.sh for Linux builds - PATCH
 
 ## [0.4.1] - 2019-11-12
+
 ### Changed
 - Attempt to fix up jobs and deployment to Cargo
 
 ### Added
 
 ## [0.4.0] - 2019-11-07
+
 ### Changed
 - Deploy tagged versions to crates.io - MINOR
 - Generalize `DockerCommandBuilder` and refactor docker-in-docker function to use it - PATCH
@@ -65,6 +79,7 @@ Status: Available for use
 - Add support for `floki` volumes. These can be used for caching build artifacts - MINOR
 
 ## [0.3.0] - 2019-10-01
+
 ### Changed
 - Rename `FLOKI_HOST_WORKDIR` to `FLOKI_HOST_MOUNTDIR` - BREAKING
 - Also search ancestors of the working directory for a `floki.yaml` - MINOR
@@ -73,13 +88,15 @@ Status: Available for use
 ### Added
 
 ## [0.2.0] - 2019-08-10
+
 ### Changed
 - Small tidyups of environment collection module - PATCH
 - Disable TLS in `dind` to fix failing `dind` functionality on newer `dind:stable` images - PATCH
 ### Added
 - Forward host working directory as `FLOKI_HOST_WORKDIR` - MINOR
 
 ## [0.1.0] - 2019-05-26
+
 ### Changed
 - Remove `forward_tmux_socket` - BREAKING
 - Remove `--pull` switch - BREAKING
@@ -102,6 +119,7 @@ Status: Available for use
 - Make `pull` a subcommand of `floki` - MINOR
 
 ## [0.0.20] - 2019-02-12
+
 ### Changed
 
 ### Added
@@ -110,46 +128,55 @@ Status: Available for use
 - Allow inner and outer shells to be specified - MINOR
 
 ## [0.0.19] - 2018-10-23
+
 ### Changed
 
 - Exit if an `init` command fails (as opposed to carrying on) - BREAKING
 - Make sure `floki` detects docker errors properly - BUGFIX
 - Non-zero exit code on error - BUGFIX
 
 ## [0.0.18] - 2018-10-05
+
 ### Changed
 - Make `floki run` work properly with subcommand switches - BUGFIX
 - Make sure floki errors if `docker build` fails - BUGFIX
 
 ## [0.0.17] - 2018-10-02
+
 ### Added
 - Package floki in an RPM - PATCH
 - Add `floki run` subcommand - PATCH
 
 ## [0.0.16] - 2018-09-10
+
 ### Changed
 - Wrapped common docker errors to make them clearer - PATCH
 
 ## [0.0.15] - 2018-08-08
+
 ### Changed
 - Only kill `dind` container if we launched it - BUGFIX
 
 ## [0.0.14] - 2018-08-08
+
 ### Added
 - --pull switch to update images - PATCH
 ### Fixed
 - Fixup docker-in-docker to allow bind mounts - PATCH
 
 ## [0.0.13] - 2018-08-06
+
 ### Added
 - docker-in-docker support - PATCH
 - Add ability to forward current user - PATCH
 
 ## [0.0.12] - 2018-07-31
+
 ### Changed
 - Made tmux socket forwarding permissive (doesn't fail if not found) - PATCH
 
 ## [0.0.11] - 2018-07-31
+
 ### Changed
 - Build spec now requires the name as a subkey of build - BREAKING
 - forward_tmux_session -> forward_tmux_socket - BREAKING
@@ -159,55 +186,66 @@ Status: Available for use
 - Sphinx docs - PATCH
 
 ## [0.0.10] - 2018-07-25
+
 ### Added
 - Allow custom docker switches - PATCH
 - Configurable pull policy - PATCH
 
 ## [0.0.9] - 2018-07-12
+
 ### Added
 - Add a version switch - PATCH
 
 ### Changed
 - Make docker not use sudo - PATCH
 
 ## [0.0.8] - 2018-07-11
+
 ### Changed
 - Empty init defaults to no commands - BUGFIX
 - Make image specification mandatory - PATCH
 
 ## [0.0.7] - 2018-07-10
+
 ### Changed
 - Change how we specify an image to build - PATCH
 
 ## [0.0.6] - 2018-07-10
+
 ### Added
 - Add option to forward tmux socket - PATCH
 - Add basic configuration validation - PATCH
 - Added ability to specify shell - PATCH
 - Add BSD style help switch - PATCH
 
 ## [0.0.5] - 2018-07-03
+
 ### Added
 - Config file now command line parameter.  Default still `./floki.yaml`
 
 ## [0.0.4] - 2018-04-06
+
 ### Changed
 - Allow build container to originate from Dockerfile - PATCH
 
 ## [0.0.3] - 2018-04-06
+
 ### Changed
 - Rename to ssh-agent forwarding field - PATCH
 
 ## [0.0.2] - 2018-04-06
+
 ### Changed
 - Rename to floki to prevent conflicts on pypi - PATCH
 
 ## [0.0.1] - 2018-04-06
+
 ### Added
 - Initial primitive version
 ### Changed
 
-[Unreleased]: https://github.com/Metaswitch/floki/compare/0.5.0...HEAD
+[unreleased]: https://github.com/Metaswitch/floki/compare/0.6.0...HEAD
+[0.6.0]: https://github.com/Metaswitch/floki/compare/0.5.0...0.6.0
 [0.5.0]: https://github.com/Metaswitch/floki/compare/0.4.3...0.5.0
 [0.4.3]: https://github.com/Metaswitch/floki/compare/0.4.2...0.4.3
 [0.4.2]: https://github.com/Metaswitch/floki/compare/0.4.1...0.4.2

Cargo.toml

@@ -8,7 +8,7 @@ keywords = ["docker"]
 categories = ["command-line-utilities"]
 license = "MIT"
 
-version = "0.5.0"
+version = "0.6.0"
 authors = ["Richard Lupton <[email protected]>",
            "Max Dymond <[email protected]>"]
 edition = '2018'

README.md

@@ -70,14 +70,14 @@ Precompiled binaries can be downloaded from the releases page (for linux and OSX
 To obtain `curl` and extract the latest linux binary directly in your shell, run
 
 ```
-$ curl -L https://github.com/Metaswitch/floki/releases/download/0.5.0/floki-0.5.0-linux.tar.gz | tar xzvf -
+$ curl -L https://github.com/Metaswitch/floki/releases/download/0.6.0/floki-0.6.0-linux.tar.gz | tar xzvf -
 ```
 
 You should be able to run `floki` from your working directory:
 
 ```
 $ ./floki --version
-floki 0.5.0
+floki 0.6.0
 ```
 
 Move it onto your path to run it from anywhere. E.g.

docs/content/documentation/getting-started.md

@@ -11,7 +11,7 @@ Precompiled binaries can be downloaded from the releases page (for linux (static
 To obtain `curl` and extract the latest linux binary directly in your shell, run
 
 ```
-$ curl -L https://github.com/Metaswitch/floki/releases/download/0.5.0/floki-0.5.0-linux.tar.gz | tar xzvf -
+$ curl -L https://github.com/Metaswitch/floki/releases/download/0.6.0/floki-0.6.0-linux.tar.gz | tar xzvf -
 ```
 
 You should be able to run `floki` from your working directory: