From d69791e2bbb741aa72905a546597bb11d1b78b47 Mon Sep 17 00:00:00 2001 From: Chef Expeditor Date: Thu, 30 Aug 2018 22:34:05 +0000 Subject: [PATCH] Executed `.expeditor/update_dockerfile.sh` Obvious fix; these changes are the result of automation not creative thinking. --- CHANGELOG.md | 41 +++++++++++++++++++---------------------- Dockerfile | 2 +- 2 files changed, 20 insertions(+), 23 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 14863da05..aae7f1e12 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,31 +1,29 @@ # Change Log - -## [v2.2.78](https://github.com/inspec/inspec/tree/v2.2.78) (2018-08-30) - -#### Merged Pull Requests -- Update demo site nom packages [#3343](https://github.com/inspec/inspec/pull/3343) ([miah](https://github.com/miah)) + - -### Changes since 2.2.70 release - -#### New Features -- Add HTTP basic auth for URL based inspec deps [#3341](https://github.com/inspec/inspec/pull/3341) ([frezbo](https://github.com/frezbo)) -- Support erb rendering [#3338](https://github.com/inspec/inspec/pull/3338) ([frezbo](https://github.com/frezbo)) - -#### Bug Fixes -- fix skip message not being passed for merge [#3329](https://github.com/inspec/inspec/pull/3329) ([frezbo](https://github.com/frezbo)) - -#### Merged Pull Requests -- Update demo site nom packages [#3343](https://github.com/inspec/inspec/pull/3343) ([miah](https://github.com/miah)) -- Fix the brew command to install inspec [#3335](https://github.com/inspec/inspec/pull/3335) ([tas50](https://github.com/tas50)) -- Convert legacy supports to their platform counterparts [#3333](https://github.com/inspec/inspec/pull/3333) ([jquick](https://github.com/jquick)) -- bump inspec/train version [#3331](https://github.com/inspec/inspec/pull/3331) ([tomqwu](https://github.com/tomqwu)) -- Cached profiles with Compliance Fetcher [#3221](https://github.com/inspec/inspec/pull/3221) ([itmustbejj](https://github.com/itmustbejj)) + +## [v2.2.78](https://github.com/inspec/inspec/tree/v2.2.78) (2018-08-30) + +#### New Features +- Support erb rendering [#3338](https://github.com/inspec/inspec/pull/3338) ([frezbo](https://github.com/frezbo)) +- Add HTTP basic auth for URL based inspec deps [#3341](https://github.com/inspec/inspec/pull/3341) ([frezbo](https://github.com/frezbo)) + +#### Bug Fixes +- fix skip message not being passed for merge [#3329](https://github.com/inspec/inspec/pull/3329) ([frezbo](https://github.com/frezbo)) + +#### Merged Pull Requests +- Cached profiles with Compliance Fetcher [#3221](https://github.com/inspec/inspec/pull/3221) ([itmustbejj](https://github.com/itmustbejj)) +- bump inspec/train version [#3331](https://github.com/inspec/inspec/pull/3331) ([tomqwu](https://github.com/tomqwu)) +- Convert legacy supports to their platform counterparts [#3333](https://github.com/inspec/inspec/pull/3333) ([jquick](https://github.com/jquick)) +- Fix the brew command to install inspec [#3335](https://github.com/inspec/inspec/pull/3335) ([tas50](https://github.com/tas50)) +- Update demo site nom packages [#3343](https://github.com/inspec/inspec/pull/3343) ([miah](https://github.com/miah)) + + ## [v2.2.70](https://github.com/inspec/inspec/tree/v2.2.70) (2018-08-24) #### Enhancements @@ -38,7 +36,6 @@ - Add cloudlinux under redhat family [#2935](https://github.com/inspec/inspec/pull/2935) ([tarcinil](https://github.com/tarcinil)) - Suppress logs for json-automate reporter [#3324](https://github.com/inspec/inspec/pull/3324) ([jquick](https://github.com/jquick)) - Rebuild InSpec omni bundles [#3327](https://github.com/inspec/inspec/pull/3327) ([jquick](https://github.com/jquick)) - ## [v2.2.64](https://github.com/inspec/inspec/tree/v2.2.64) (2018-08-17) diff --git a/Dockerfile b/Dockerfile index c67f49384..d3a3a94e3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM ruby:alpine MAINTAINER Chef Software, Inc. -ARG VERSION=2.2.70 +ARG VERSION=2.2.78 ARG GEM_SOURCE=https://rubygems.org RUN mkdir -p /share