Skip to content

Commit

Permalink
(maint) Merge up 0a7191d to master
Browse files Browse the repository at this point in the history
Generated by CI

* commit '0a7191d5af5a5780089484a304a6918ff3886fcd':
  (maint) Update puppet-resource_api to 6d77e7dd4d992590990b1d5c1cd445d1691277c0
  (maint) ignore hadolint DL3028
  • Loading branch information
puppetlabs-jenkins committed Jun 27, 2019
2 parents bac1d63 + 0a7191d commit 7a93f03
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion docker/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ git_describe = $(shell git describe)
vcs_ref := $(shell git rev-parse HEAD)
build_date := $(shell date -u +%FT%T)
hadolint_available := $(shell hadolint --help > /dev/null 2>&1; echo $$?)
hadolint_command := hadolint --ignore DL3008 --ignore DL3018 --ignore DL4000 --ignore DL4001
hadolint_command := hadolint --ignore DL3008 --ignore DL3018 --ignore DL4000 --ignore DL4001 --ignore DL3028
hadolint_container := hadolint/hadolint:latest
pwd := $(shell pwd)
export BUNDLE_PATH = $(pwd)/.bundle/gems
Expand Down

0 comments on commit 7a93f03

Please sign in to comment.