From 0863491510b298269773ad64e92fdc951368342c Mon Sep 17 00:00:00 2001 From: Matt Melquiond Date: Mon, 7 Oct 2019 16:36:46 +0200 Subject: [PATCH] Bumped version --- CHANGELOG.md | 16 ++++++++++++++-- VERSION | 2 +- api/management/commands/current_version.py | 2 +- docs/docs/installation.md | 3 ++- docs/docs/running.md | 6 +++--- tests/test_command.py | 2 +- 6 files changed, 22 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3af382a3..b9e6f528 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,19 @@ # Changelog +## [2019.2.2] - 2019-09-21 + +- use slim docker image + +- Added rest auth + +- Added pillar override + +- Updated deps + +[2019.2.2]: https://github.com/latenighttales/alcali/v2019.2.2...HEAD + ## [2019.2.1] - 2019-09-21 -### Added + - Frontend refactor -[2019.2.1]: https://github.com/latenighttales/alcali/v2019.2.1...HEAD +[2019.2.1]: https://github.com/latenighttales/alcali/v2019.2.1...v2019.2.2 diff --git a/VERSION b/VERSION index 1dd9b262..0b18bb8c 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2019.2.1 +2019.2.2 diff --git a/api/management/commands/current_version.py b/api/management/commands/current_version.py index be68ab1d..f6d588a2 100644 --- a/api/management/commands/current_version.py +++ b/api/management/commands/current_version.py @@ -7,4 +7,4 @@ class Command(BaseCommand): def handle(self, *args, **options): # TODO: Dynamic - self.stdout.write("alcali version 2019.2.1") + self.stdout.write("alcali version 2019.2.2") diff --git a/docs/docs/installation.md b/docs/docs/installation.md index 4a374b5e..a2c1655e 100644 --- a/docs/docs/installation.md +++ b/docs/docs/installation.md @@ -266,7 +266,8 @@ Otherwise, there is a [Formula](https://github.com/latenighttales/alcali-formula The official [Docker image](https://hub.docker.com/r/latenighttales/alcali) for Alcali comes with all dependencies pre-installed and ready-to-use with the latest version published on PyPI. Pull it with: ```commandline -docker pull latenighttales/alcali:2019.2.1 +# you can specify which version: latenighttales/alcali:2018.3.2 +docker pull latenighttales/alcali:latest ``` The `alcali` executable is provided as an entrypoint. diff --git a/docs/docs/running.md b/docs/docs/running.md index c13673a1..439edef8 100644 --- a/docs/docs/running.md +++ b/docs/docs/running.md @@ -11,7 +11,7 @@ You can verify installation by running: ```commandline alcali current_version -# alcali version 2019.2.1 +# alcali version 2019.2.2 ``` You can also check that Alcali can access `salt` database and that [needed env var](configuration.md) are set and loaded by running: @@ -70,6 +70,6 @@ gunicorn config.wsgi:application -w 4 --chdir $(alcali location) In a docker container: ```commandline -docker run --rm -it -p 8000:8000 --env-file=FILE latenighttales/alcali:2019.2.1 bash -c "gunicorn config.wsgi:application -w 4 --chdir $(alcali location)" +docker run --rm -it -p 8000:8000 --env-file=FILE latenighttales/alcali:2019.2.2 bash -c "gunicorn config.wsgi:application -w 4 --chdir $(alcali location)" ``` -Where FILE is the location of the [.env file](configuration.md) \ No newline at end of file +Where FILE is the location of the [.env file](configuration.md) diff --git a/tests/test_command.py b/tests/test_command.py index 63c62db9..d0fe5184 100644 --- a/tests/test_command.py +++ b/tests/test_command.py @@ -51,7 +51,7 @@ def test_manage_token_reset(admin_user): def test_current_version(): out = StringIO() call_command("current_version", stdout=out) - assert "alcali version 2019.2.1" in out.getvalue() + assert "alcali version 2019.2.2" in out.getvalue() def test_location():