From ba003ed529d692ecf1be6cf0d6a6dd8c84e7d78f Mon Sep 17 00:00:00 2001 From: Chef Expeditor Date: Sat, 28 Sep 2019 00:56:01 +0000 Subject: [PATCH] Executed '.expeditor/update_dockerfile.sh' Obvious fix; these changes are the result of automation not creative thinking. --- CHANGELOG.md | 25 +++++++++++-------------- Dockerfile | 2 +- 2 files changed, 12 insertions(+), 15 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 14dc31a0b..fde49a51c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,23 +1,21 @@ # Change Log - -## [v4.17.11](https://github.com/inspec/inspec/tree/v4.17.11) (2019-09-27) - -#### Merged Pull Requests -- fix Gemfile for inspec-core-bin gem [#4535](https://github.com/inspec/inspec/pull/4535) ([lamont-granquist](https://github.com/lamont-granquist)) + - -### Changes since 4.17.7 release - -#### Merged Pull Requests -- fix Gemfile for inspec-core-bin gem [#4535](https://github.com/inspec/inspec/pull/4535) ([lamont-granquist](https://github.com/lamont-granquist)) -- Fixed inspec lazy resource loader for rspec test dsl (eg before/after) [#4534](https://github.com/inspec/inspec/pull/4534) ([zenspider](https://github.com/zenspider)) -- Add resource stubs so the resource loader will find all resources [#4526](https://github.com/inspec/inspec/pull/4526) ([clintoncwolfe](https://github.com/clintoncwolfe)) -- Remove maintainers task from require [#4531](https://github.com/inspec/inspec/pull/4531) ([miah](https://github.com/miah)) + +## [v4.17.11](https://github.com/inspec/inspec/tree/v4.17.11) (2019-09-28) + +#### Merged Pull Requests +- Remove maintainers task from require [#4531](https://github.com/inspec/inspec/pull/4531) ([miah](https://github.com/miah)) +- Add resource stubs so the resource loader will find all resources [#4526](https://github.com/inspec/inspec/pull/4526) ([clintoncwolfe](https://github.com/clintoncwolfe)) +- Fixed inspec lazy resource loader for rspec test dsl (eg before/after) [#4534](https://github.com/inspec/inspec/pull/4534) ([zenspider](https://github.com/zenspider)) +- fix Gemfile for inspec-core-bin gem [#4535](https://github.com/inspec/inspec/pull/4535) ([lamont-granquist](https://github.com/lamont-granquist)) + + ## [v4.17.7](https://github.com/inspec/inspec/tree/v4.17.7) (2019-09-27) #### Bug Fixes @@ -51,7 +49,6 @@ - Split and parallelize some tests to make them faster [#4490](https://github.com/inspec/inspec/pull/4490) ([zenspider](https://github.com/zenspider)) - Fixed Inspec::Plugin::V2::Registry#detect_system_plugins [#4513](https://github.com/inspec/inspec/pull/4513) ([zenspider](https://github.com/zenspider)) - Added first draft of waiver doco. [#4518](https://github.com/inspec/inspec/pull/4518) ([zenspider](https://github.com/zenspider)) - ## [v4.16.0](https://github.com/inspec/inspec/tree/v4.16.0) (2019-08-29) diff --git a/Dockerfile b/Dockerfile index 54150fa32..c65912d23 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM ruby:alpine LABEL maintainer="Chef Software, Inc. " ARG EXPEDITOR_VERSION -ARG VERSION=4.17.7 +ARG VERSION=4.17.11 ARG GEM_SOURCE=https://rubygems.org # Allow VERSION below to be controlled by either VERSION or EXPEDITOR_VERSION build arguments