Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/docker/alpine/terragrunt-1.1.3
Browse files Browse the repository at this point in the history
  • Loading branch information
admiralAwkbar committed Jan 10, 2022
2 parents b386624 + a3bc35d commit 9b1a7cc
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 20 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@ FROM yoheimuta/protolint:v0.35.2 as protolint
FROM golangci/golangci-lint:v1.43.0 as golangci-lint
FROM koalaman/shellcheck:v0.8.0 as shellcheck
FROM ghcr.io/terraform-linters/tflint-bundle:v0.34.1.1 as tflint
FROM hashicorp/terraform:1.1.2 as terraform
FROM alpine/terragrunt:1.1.3 as terragrunt
FROM hashicorp/terraform:1.1.3 as terraform
FROM mvdan/shfmt:v3.4.2 as shfmt
FROM accurics/terrascan:1.13.0 as terrascan
FROM hadolint/hadolint:latest-alpine as dockerfile-lint
FROM assignuser/chktex-alpine:v0.1.1 as chktex
FROM zricethezav/gitleaks:v8.2.5 as gitleaks
FROM zricethezav/gitleaks:v8.2.7 as gitleaks
FROM garethr/kubeval:0.15.0 as kubeval
FROM ghcr.io/awkbar-devops/clang-format:v1.0.2 as clang-format
FROM scalameta/scalafmt:v3.3.1 as scalafmt
Expand Down
32 changes: 15 additions & 17 deletions dependencies/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dependencies/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"lodash": "^4.17.21",
"markdownlint-cli": "^0.30.0",
"node-fetch": "^3.1.0",
"npm-groovy-lint": "^9.3.0",
"npm-groovy-lint": "^9.3.2",
"prettier": "^2.5.1",
"prettyjson": "^1.2.1",
"pug": "^3.0.2",
Expand Down

0 comments on commit 9b1a7cc

Please sign in to comment.