From 18c1b8d39c4943d33c35cc5d0629b380cdab5dca Mon Sep 17 00:00:00 2001 From: Chef Expeditor Date: Thu, 15 Aug 2019 20:31:54 +0000 Subject: [PATCH] Executed '.expeditor/update_dockerfile.sh' Obvious fix; these changes are the result of automation not creative thinking. --- CHANGELOG.md | 55 +++++++++++++++++++++++++--------------------------- Dockerfile | 2 +- 2 files changed, 27 insertions(+), 30 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4a8049202..71a88a07a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,38 +1,36 @@ # Change Log - -## [v4.12.0](https://github.com/inspec/inspec/tree/v4.12.0) (2019-08-15) - -#### Merged Pull Requests -- Add deps on train 3 and train-winrm 0.2 [#4355](https://github.com/inspec/inspec/pull/4355) ([clintoncwolfe](https://github.com/clintoncwolfe)) + - -### Changes since 4.10.4 release - -#### New Features -- Add startuser windows service [#4363](https://github.com/inspec/inspec/pull/4363) ([mbaitelman](https://github.com/mbaitelman)) - -#### Bug Fixes -- group resource: Modified DarwinGroup to collect all users properly on macos [#4343](https://github.com/inspec/inspec/pull/4343) ([zenspider](https://github.com/zenspider)) -- Fixed syntax errors in wmi doco. [#4370](https://github.com/inspec/inspec/pull/4370) ([zenspider](https://github.com/zenspider)) - -#### Merged Pull Requests -- Add deps on train 3 and train-winrm 0.2 [#4355](https://github.com/inspec/inspec/pull/4355) ([clintoncwolfe](https://github.com/clintoncwolfe)) -- Begin signing MSI's with renewed Windows Signing Cert [#4386](https://github.com/inspec/inspec/pull/4386) ([schisamo](https://github.com/schisamo)) -- Moved the osx? guard below minitest/autorun. [#4381](https://github.com/inspec/inspec/pull/4381) ([zenspider](https://github.com/zenspider)) -- change announcement to LCR Road Trip [#4379](https://github.com/inspec/inspec/pull/4379) ([shaunyap](https://github.com/shaunyap)) -- I didn't get the BK setup right, nor did the verification check this. [#4380](https://github.com/inspec/inspec/pull/4380) ([zenspider](https://github.com/zenspider)) -- README: Add platform detail to support info in runtime list [#4375](https://github.com/inspec/inspec/pull/4375) ([clintoncwolfe](https://github.com/clintoncwolfe)) -- Fixed typo in umask example [#4360](https://github.com/inspec/inspec/pull/4360) ([kclinden](https://github.com/kclinden)) -- Stop building Chef InSpec on SLES 11 [#4374](https://github.com/inspec/inspec/pull/4374) ([schisamo](https://github.com/schisamo)) -- Remove timebombs on skip_until and licensing tests. [#4351](https://github.com/inspec/inspec/pull/4351) ([zenspider](https://github.com/zenspider)) -- Add a retry to expeditor defaults, per shain's advice. [#4369](https://github.com/inspec/inspec/pull/4369) ([zenspider](https://github.com/zenspider)) -- Move some resources into Inspec::Resources module [#4361](https://github.com/inspec/inspec/pull/4361) ([KrisShannon](https://github.com/KrisShannon)) -- Only bump versions when we modify InSpec. [#4348](https://github.com/inspec/inspec/pull/4348) ([miah](https://github.com/miah)) + +## [v4.12.0](https://github.com/inspec/inspec/tree/v4.12.0) (2019-08-15) + +#### New Features +- Add startuser windows service [#4363](https://github.com/inspec/inspec/pull/4363) ([mbaitelman](https://github.com/mbaitelman)) + +#### Bug Fixes +- Fixed syntax errors in wmi doco. [#4370](https://github.com/inspec/inspec/pull/4370) ([zenspider](https://github.com/zenspider)) +- group resource: Modified DarwinGroup to collect all users properly on macos [#4343](https://github.com/inspec/inspec/pull/4343) ([zenspider](https://github.com/zenspider)) + +#### Merged Pull Requests +- Only bump versions when we modify InSpec. [#4348](https://github.com/inspec/inspec/pull/4348) ([miah](https://github.com/miah)) +- Move some resources into Inspec::Resources module [#4361](https://github.com/inspec/inspec/pull/4361) ([KrisShannon](https://github.com/KrisShannon)) +- Add a retry to expeditor defaults, per shain's advice. [#4369](https://github.com/inspec/inspec/pull/4369) ([zenspider](https://github.com/zenspider)) +- Remove timebombs on skip_until and licensing tests. [#4351](https://github.com/inspec/inspec/pull/4351) ([zenspider](https://github.com/zenspider)) +- Stop building Chef InSpec on SLES 11 [#4374](https://github.com/inspec/inspec/pull/4374) ([schisamo](https://github.com/schisamo)) +- Fixed typo in umask example [#4360](https://github.com/inspec/inspec/pull/4360) ([kclinden](https://github.com/kclinden)) +- README: Add platform detail to support info in runtime list [#4375](https://github.com/inspec/inspec/pull/4375) ([clintoncwolfe](https://github.com/clintoncwolfe)) +- I didn't get the BK setup right, nor did the verification check this. [#4380](https://github.com/inspec/inspec/pull/4380) ([zenspider](https://github.com/zenspider)) +- change announcement to LCR Road Trip [#4379](https://github.com/inspec/inspec/pull/4379) ([shaunyap](https://github.com/shaunyap)) +- Moved the osx? guard below minitest/autorun. [#4381](https://github.com/inspec/inspec/pull/4381) ([zenspider](https://github.com/zenspider)) +- Begin signing MSI's with renewed Windows Signing Cert [#4386](https://github.com/inspec/inspec/pull/4386) ([schisamo](https://github.com/schisamo)) +- Add deps on train 3 and train-winrm 0.2 [#4355](https://github.com/inspec/inspec/pull/4355) ([clintoncwolfe](https://github.com/clintoncwolfe)) + + ## [v4.10.4](https://github.com/inspec/inspec/tree/v4.10.4) (2019-08-01) #### New Features @@ -54,7 +52,6 @@ - point badge to master [#4347](https://github.com/inspec/inspec/pull/4347) ([miah](https://github.com/miah)) - changed legal refs to point to chef.io proper [#4345](https://github.com/inspec/inspec/pull/4345) ([kekaichinose](https://github.com/kekaichinose)) - Bump skipped license tests by 2 weeks. [#4352](https://github.com/inspec/inspec/pull/4352) ([zenspider](https://github.com/zenspider)) - ## [v4.7.24](https://github.com/inspec/inspec/tree/v4.7.24) (2019-07-26) diff --git a/Dockerfile b/Dockerfile index 3beef167b..0189f9ae8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM ruby:alpine LABEL maintainer="Chef Software, Inc. " ARG EXPEDITOR_VERSION -ARG VERSION=4.10.4 +ARG VERSION=4.12.0 ARG GEM_SOURCE=https://rubygems.org # Allow VERSION below to be controlled by either VERSION or EXPEDITOR_VERSION build arguments