From aabe31c775e221207a096b84895704a3dd2cad14 Mon Sep 17 00:00:00 2001 From: Tortue Torche <126358-tortuetorche@users.noreply.gitlab.com> Date: Mon, 27 Jan 2020 16:06:38 +0100 Subject: [PATCH] Bump psu version to 1.0.4 Update CHANGELOG --- CHANGELOG.md | 13 ++++++++++++- README.md | 11 ++++++----- docs/README.md | 2 +- psu | 2 +- 4 files changed, 20 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dc004c9..e0f7fb3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [1.0.4] - 2020-01-27 +### Added +- Use the `$CLEANUP_REGISTRIES_ENABLED` CI variable for deleting Docker repository tags in bulk + +### Changed +- Remove unused git and Docker tags in `README.md` + +### Fixed +- Fix scheduled pipeline who update Docker images for the latest stable git tag + ## [1.0.3] - 2020-01-09 ### Added - Cleaning old Docker repository builds tags via [GitLab API](https://docs.gitlab.com/12.6/ee/api/container_registry.html#delete-repository-tags-in-bulk) @@ -65,7 +75,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.3...1-0-stable +[Unreleased]: https://gitlab.com/psuapp/psu/compare/v1.0.4...1-0-stable +[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 [1.0.1]: https://gitlab.com/psuapp/psu/-/tags/v1.0.1 diff --git a/README.md b/README.md index 93f6e8c..869cd0b 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.3` -> [`v1.0.3`](https://gitlab.com/psuapp/psu/-/tags/v1.0.3) +- `1`, `1.0`, `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) - `1.0.0` -> [`v1.0.0`](https://gitlab.com/psuapp/psu/-/tags/v1.0.0) @@ -79,13 +80,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.3-core`, `core` -> [`v1.0.3`](https://gitlab.com/psuapp/psu/-/tags/v1.0.3) +- `1-core`, `1.0-core`, `1.0.4-core`, `core` -> [`v1.0.4`](https://gitlab.com/psuapp/psu/-/tags/v1.0.4) 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.3-debian`, `debian` -> [`v1.0.3`](https://gitlab.com/psuapp/psu/-/tags/v1.0.3) -- `1-debian-core`, `1.0-debian-core`, `1.0.3-debian-core`, `debian-core` -> [`v1.0.3`](https://gitlab.com/psuapp/psu/-/tags/v1.0.3) +- `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) #### Testing/debugging: @@ -95,7 +96,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.3 +Portainer Stack Utils, version 1.0.4 License GPLv3: GNU GPL version 3 ``` diff --git a/docs/README.md b/docs/README.md index f019ff2..30b4b8e 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.3/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.4/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 95f7089..052cfcf 100644 --- a/psu +++ b/psu @@ -27,7 +27,7 @@ set -e # None # ############################ main() { - VERSION="1.0.3" + VERSION="1.0.4" OPTIONS_TABLE=( # option_key;flag_text;option_text;description