From 3e52f311bf41e3b6f6e37351bf938871e99b02bc Mon Sep 17 00:00:00 2001 From: Tortue Torche <126358-tortuetorche@users.noreply.gitlab.com> Date: Wed, 29 Jul 2020 16:49:25 +0200 Subject: [PATCH] Backport psu changelog and doc from version 1.0.5 --- CHANGELOG.md | 10 ++++++---- README.md | 11 ++++++----- docs/README.md | 2 +- psu | 2 +- 4 files changed, 14 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2fbc7e6..9b3c6a9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,12 +5,13 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] -### Added -- Test PSU with Portainer [1.24.1](https://app.swaggerhub.com/apis/deviantony/Portainer/1.24.1) API - ### Changed - Upgrade operating system of Docker based images, with [Alpine 3.12](https://hub.docker.com/_/alpine) and [Debian 10](https://hub.docker.com/_/debian) +## [1.0.5] - 2020-07-29 +### Added +- Test PSU with Portainer [1.24.1](https://app.swaggerhub.com/apis/deviantony/Portainer/1.24.1) API + ### Removed - Test PSU with Portainer [1.21.0](https://app.swaggerhub.com/apis/deviantony/Portainer/1.21.0) API @@ -83,7 +84,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.4...1-0-stable +[Unreleased]: https://gitlab.com/psuapp/psu/compare/v1.0.5...1-0-stable +[1.0.5]: https://gitlab.com/psuapp/psu/-/tags/v1.0.5 [1.0.4]: https://gitlab.com/psuapp/psu/-/tags/v1.0.4 [1.0.3]: https://gitlab.com/psuapp/psu/-/tags/v1.0.3 [1.0.2]: https://gitlab.com/psuapp/psu/-/tags/v1.0.2 diff --git a/README.md b/README.md index e2c1deb..18a1bb6 100644 --- a/README.md +++ b/README.md @@ -66,7 +66,8 @@ 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): -- `1`, `1.0`, `1.0.4` -> [`v1.0.4`](https://gitlab.com/psuapp/psu/-/tags/v1.0.4) +- `1`, `1.0`, `1.0.5` -> [`v1.0.5`](https://gitlab.com/psuapp/psu/-/tags/v1.0.5) +- `1.0.4` -> [`v1.0.4`](https://gitlab.com/psuapp/psu/-/tags/v1.0.4) - `1.0.3` -> [`v1.0.3`](https://gitlab.com/psuapp/psu/-/tags/v1.0.3) - `1.0.2` -> [`v1.0.2`](https://gitlab.com/psuapp/psu/-/tags/v1.0.2) - `1.0.1` -> [`v1.0.1`](https://gitlab.com/psuapp/psu/-/tags/v1.0.1) @@ -80,13 +81,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. -- `1-core`, `1.0-core`, `1.0.4-core`, `core` -> [`v1.0.4`](https://gitlab.com/psuapp/psu/-/tags/v1.0.4) +- `1-core`, `1.0-core`, `1.0.5-core`, `core` -> [`v1.0.5`](https://gitlab.com/psuapp/psu/-/tags/v1.0.5) The `debian` and `debian-core` variants use [Debian](https://www.debian.org) instead of [Alpine](https://alpinelinux.org/) as base image for `psu`. -- `1-debian`, `1.0-debian`, `1.0.4-debian`, `debian` -> [`v1.0.4`](https://gitlab.com/psuapp/psu/-/tags/v1.0.4) -- `1-debian-core`, `1.0-debian-core`, `1.0.4-debian-core`, `debian-core` -> [`v1.0.4`](https://gitlab.com/psuapp/psu/-/tags/v1.0.4) +- `1-debian`, `1.0-debian`, `1.0.5-debian`, `debian` -> [`v1.0.5`](https://gitlab.com/psuapp/psu/-/tags/v1.0.5) +- `1-debian-core`, `1.0-debian-core`, `1.0.5-debian-core`, `debian-core` -> [`v1.0.5`](https://gitlab.com/psuapp/psu/-/tags/v1.0.5) #### Testing/debugging: @@ -96,7 +97,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:1.0 # Run any commands here! E.g. $ psu --version -Portainer Stack Utils, version 1.0.4 +Portainer Stack Utils, version 1.0.5 License GPLv3: GNU GPL version 3 ``` diff --git a/docs/README.md b/docs/README.md index 30b4b8e..131587a 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.4/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.5/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 052cfcf..846aa41 100644 --- a/psu +++ b/psu @@ -27,7 +27,7 @@ set -e # None # ############################ main() { - VERSION="1.0.4" + VERSION="1.0.5" OPTIONS_TABLE=( # option_key;flag_text;option_text;description