From a6c0b232a5f4237c1e50b6b3c6f3f414021480ab Mon Sep 17 00:00:00 2001 From: Martin Buchleitner Date: Wed, 8 Nov 2023 14:27:21 +0100 Subject: [PATCH] fix: adding vault (#20) * fix: adding vault Signed-off-by: Martin Buchleitner --------- Signed-off-by: Martin Buchleitner --- .pre-commit-config.yaml | 12 ++++++------ Dockerfile | 3 +++ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 0c20f60..2f776da 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -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] diff --git a/Dockerfile b/Dockerfile index 5bf9a70..fb38ffe 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,6 +5,7 @@ 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 @@ -12,6 +13,7 @@ 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 @@ -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