From 1b28ba755247638983798684ea196c8cc92f581a Mon Sep 17 00:00:00 2001 From: Geri Jennings Date: Mon, 7 Jun 2021 16:41:59 -0400 Subject: [PATCH 1/2] Bump Conjur base image to 1.0.3 --- Dockerfile | 2 +- Dockerfile.ubi | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 5b7a3f7615..3f25321d51 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM cyberark/ubuntu-ruby-fips:1.0.2 +FROM cyberark/ubuntu-ruby-fips:1.0.3 ENV DEBIAN_FRONTEND=noninteractive \ PORT=80 \ diff --git a/Dockerfile.ubi b/Dockerfile.ubi index 41b46bb282..e617d71757 100644 --- a/Dockerfile.ubi +++ b/Dockerfile.ubi @@ -1,5 +1,5 @@ # Conjur Base Image (UBI) -FROM cyberark/ubi-ruby-fips:1.0.2 +FROM cyberark/ubi-ruby-fips:1.0.3 EXPOSE 8080 ARG VERSION From 53a17916b9b8e47fea1e2d346e345654e114136a Mon Sep 17 00:00:00 2001 From: Geri Jennings Date: Mon, 7 Jun 2021 17:27:00 -0400 Subject: [PATCH 2/2] Bump version to 1.11.7 --- CHANGELOG.md | 6 +++++- NOTICES.txt | 30 ++++++++++++++++++++++++++++-- VERSION | 2 +- 3 files changed, 34 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6fffb960ed..7b97e6eadc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,9 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). ## [Unreleased] + +## [1.11.7] - 2021-06-08 + ### Added - Enabled authenticators can now be configured via a configuration file, or the CONJUR_AUTHENTICATORS environment variable. @@ -643,7 +646,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ### Added - The first tagged version. -[Unreleased]: https://github.com/cyberark/conjur/compare/v1.11.6...HEAD +[Unreleased]: https://github.com/cyberark/conjur/compare/v1.11.7...HEAD +[1.11.7]: https://github.com/cyberark/conjur/compare/v1.11.6...v1.11.7 [1.11.6]: https://github.com/cyberark/conjur/compare/v1.11.5...v1.11.6 [1.11.5]: https://github.com/cyberark/conjur/compare/v1.11.4...v1.11.5 [1.11.4]: https://github.com/cyberark/conjur/compare/v1.11.3...v1.11.4 diff --git a/NOTICES.txt b/NOTICES.txt index d45ebceb53..a1d31a689a 100644 --- a/NOTICES.txt +++ b/NOTICES.txt @@ -19,11 +19,12 @@ Section 2: BSD-2-Clause Section 3: BSD-3-Clause >>> https://rubygems.org/gems/ffi/versions/1.12.2 ->>> https://rubygems.org/gems/puma/versions/3.12.6 +>>> https://rubygems.org/gems/puma/versions/4.3.8 Section 4: MIT >>> https://rubygems.org/gems/activesupport/versions/5.2.6 +>>> https://rubygems.org/gems/anyway_config/versions/2.1.0 >>> https://rubygems.org/gems/base58/versions/0.2.3 >>> https://rubygems.org/gems/bcrypt/versions/3.1.13 >>> https://rubygems.org/gems/command_class/versions/0.0.2 @@ -192,7 +193,7 @@ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ->>> https://rubygems.org/gems/puma/versions/3.12.6 +>>> https://rubygems.org/gems/puma/versions/4.3.8 Some code copyright (c) 2005, Zed Shaw Copyright (c) 2011, Evan Phoenix @@ -247,6 +248,31 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +>>> https://rubygems.org/gems/anyway_config/versions/2.1.0 + +Copyright (c) 2015-2020 Vladimir Dementyev + +MIT License + +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + >>> https://rubygems.org/gems/base58/versions/0.2.3 Copyright (c) 2009 - 2018 Douglas F Shearer diff --git a/VERSION b/VERSION index 6b37cb71cf..29eb2917fe 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.11.6 +1.11.7