Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: adding vault #20

Merged
merged 3 commits into from
Nov 8, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
# See https://pre-commit.com/hooks.html for more hooks
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v3.2.0
rev: v4.5.0
hooks:
- id: trailing-whitespace
- id: end-of-file-fixer
- id: check-yaml
- id: check-added-large-files
- repo: https://github.com/hadolint/hadolint
rev: master
hooks:
- id: hadolint-docker
stages: [commit]
# - repo: https://github.com/hadolint/hadolint
# rev: v2.12.0
# hooks:
# - id: hadolint-docker
# stages: [commit]
3 changes: 3 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,15 @@ ARG YQ_VERSION=4.35.2
ARG TERRAFORM_DOCS_VERSION=latest
ARG TFLINT_VERSION=latest
ARG TFSEC_VERSION=latest
ARG VAULT_VERSION=1.15.1

FROM docker.io/hashicorp/packer:$PACKER_VERSION as packer
FROM docker.io/mondoo/client:$MONDOO_VERSION as mondoo
FROM docker.io/mikefarah/yq:$YQ_VERSION as yq
FROM quay.io/terraform-docs/terraform-docs:$TERRAFORM_DOCS_VERSION as tfdocs
FROM ghcr.io/terraform-linters/tflint:$TFLINT_VERSION as tflint
FROM docker.io/aquasec/tfsec-alpine:$TFSEC_VERSION as tfsec
FROM docker.io/hashicorp/vault:${VAULT_VERSION} as vault

FROM docker.io/hashicorp/terraform:$TERRAFORM_VERSION as tf

Expand All @@ -25,6 +27,7 @@ COPY --from=packer /bin/packer /usr/local/bin/packer
COPY --from=tfdocs /usr/local/bin/terraform-docs /usr/local/bin/terraform-docs
COPY --from=tflint /usr/local/bin/tflint /usr/local/bin/tflint
COPY --from=tfsec /usr/bin/tfsec /usr/local/bin/tfsec
COPY --from=vault /bin/vault /usr/local/bin/vault

# hadolint ignore=DL3013
RUN pip3 install --no-cache-dir azure-cli pre-commit
Expand Down
Loading