From 3033702a694b3739fc6b2ce0d6361ca2f19731a9 Mon Sep 17 00:00:00 2001 From: Tortue Torche Date: Tue, 10 Dec 2019 18:09:14 +0100 Subject: [PATCH] Bump psu version to 1.0.2 --- CHANGELOG.md | 7 ++++++- README.md | 12 +++++++----- docs/README.md | 2 +- psu | 2 +- 4 files changed, 15 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3b19840..24f3d5e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [1.0.2] - 2019-12-10 +### Added +- Test PSU with Portainer [1.23.0](https://app.swaggerhub.com/apis/deviantony/Portainer/1.23.0) API + ## [1.0.1] - 2019-10-29 ### Fixed - If the `--insecure` option is set to `false` and the `HTTPIE_VERIFY_SSL` environment variable is set, we keep its value instead of overwrite it to `yes`. @@ -51,7 +55,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Debug mode - Strict mode -[Unreleased]: https://gitlab.com/psuapp/psu/compare/v1.0.1...master +[Unreleased]: https://gitlab.com/psuapp/psu/compare/v1.0.2...master +[1.0.2]: https://gitlab.com/psuapp/psu/-/tags/v1.0.2 [1.0.1]: https://gitlab.com/psuapp/psu/-/tags/v1.0.1 [1.0.0]: https://gitlab.com/psuapp/psu/-/tags/v1.0.0 [0.1.2]: https://gitlab.com/psuapp/psu/-/tags/v0.1.2 diff --git a/README.md b/README.md index 0251fd8..e7aa678 100644 --- a/README.md +++ b/README.md @@ -66,7 +66,9 @@ For detailed instructions, see [How to use](#how-to-use) section. Published Docker images are [tagged](https://hub.docker.com/r/psuapp/psu/tags) matching [GitLab tags](https://gitlab.com/psuapp/psu/-/tags): - `dev` -> [`dev`](https://gitlab.com/psuapp/psu/-/tags/dev) -- `1`, `1.0`, `1.0.1`, `latest` -> [`v1.0.1`](https://gitlab.com/psuapp/psu/-/tags/v1.0.1) +- `1`, `1.0`, `1.0.2`, `latest` -> [`v1.0.2`](https://gitlab.com/psuapp/psu/-/tags/v1.0.2) +- `1`, `1.0`, `1.0.1` -> [`v1.0.1`](https://gitlab.com/psuapp/psu/-/tags/v1.0.1) +- `1`, `1.0`, `1.0.0` -> [`v1.0.0`](https://gitlab.com/psuapp/psu/-/tags/v1.0.0) - `0.1.2` -> [`v0.1.2`](https://gitlab.com/psuapp/psu/-/tags/v0.1.2) - `0.1.1` -> [`v0.1.1`](https://gitlab.com/psuapp/psu/-/tags/v0.1.1) - `0.1.0` -> [`v0.1.0`](https://gitlab.com/psuapp/psu/-/tags/v0.1.0) @@ -76,13 +78,13 @@ Published Docker images are [tagged](https://hub.docker.com/r/psuapp/psu/tags) m The `core` variant doesn't include `docker-compose`, so it's a bit smaller. But you can't lint Docker compose/stack file before deploying a stack. - `dev-core` -> [`dev`](https://gitlab.com/psuapp/psu/-/tags/dev) -- `1-core`, `1.0-core`, `1.0.1-core`, `core` -> [`v1.0.1`](https://gitlab.com/psuapp/psu/-/tags/v1.0.1) +- `1-core`, `1.0-core`, `1.0.2-core`, `core` -> [`v1.0.2`](https://gitlab.com/psuapp/psu/-/tags/v1.0.2) The `debian` and `debian-core` variants use [Debian](https://www.debian.org) instead of [Alpine](https://alpinelinux.org/) as base image for `psu`. - `dev-debian` -> [`dev`](https://gitlab.com/psuapp/psu/-/tags/dev) - `dev-debian-core` -> [`dev`](https://gitlab.com/psuapp/psu/-/tags/dev) -- `1-debian`, `1.0-debian`, `1.0.1-debian`, `debian` -> [`v1.0.1`](https://gitlab.com/psuapp/psu/-/tags/v1.0.1) -- `1-debian-core`, `1.0-debian-core`, `1.0.1-debian-core`, `debian-core` -> [`v1.0.1`](https://gitlab.com/psuapp/psu/-/tags/v1.0.1) +- `1-debian`, `1.0-debian`, `1.0.2-debian`, `debian` -> [`v1.0.2`](https://gitlab.com/psuapp/psu/-/tags/v1.0.2) +- `1-debian-core`, `1.0-debian-core`, `1.0.2-debian-core`, `debian-core` -> [`v1.0.2`](https://gitlab.com/psuapp/psu/-/tags/v1.0.2) #### Testing/debugging: @@ -92,7 +94,7 @@ For testing/debugging, you can use this Docker image in interactive mode, to run docker run -v $(pwd)/docker-compose.yml:/docker-compose.yml -it --rm --entrypoint bash psuapp/psu # Run any commands here! E.g. $ psu --version -Portainer Stack Utils, version 1.0.1 +Portainer Stack Utils, version 1.0.2 License GPLv3: GNU GPL version 3 ``` diff --git a/docs/README.md b/docs/README.md index 6d1e83f..644b988 100644 --- a/docs/README.md +++ b/docs/README.md @@ -729,5 +729,5 @@ The `psu` definition of a job is a Swarm [service](https://docs.docker.com/engin Using a job is useful when you want to have a service who run a script (e.g. database migration). And shutdown this service when its script is successfully executed. -See the service named `job` in the [`docker-stack-web-app.yml`](https://gitlab.com/psuapp/psu/tree/v1.0.1/tests/dockerfiles/docker-stack-web-app.yml) file, for a real use case. +See the service named `job` in the [`docker-stack-web-app.yml`](https://gitlab.com/psuapp/psu/tree/v1.0.2/tests/dockerfiles/docker-stack-web-app.yml) file, for a real use case. It has both a container's label `job-name` and a restart policy set to `none`. diff --git a/psu b/psu index 30305d8..6794d20 100644 --- a/psu +++ b/psu @@ -27,7 +27,7 @@ set -e # None # ############################ main() { - VERSION="1.0.1" + VERSION="1.0.2" OPTIONS_TABLE=( # option_key;flag_text;option_text;description