From 918b646793dede04aac4328af81abd52f9d8aaf3 Mon Sep 17 00:00:00 2001 From: Nick <10092581+NickLarsenNZ@users.noreply.github.com> Date: Wed, 18 Sep 2024 07:31:23 +1200 Subject: [PATCH] ci(pre-commit): Ignore j2 files for hadolint hook (#438) * ci(pre-commit): Ignore j2 files for hadolint hook * chore(template): Add spaces back into variable interpolation (to make it what it was before recent broken changes). --- .pre-commit-config.yaml | 1 + template/docker/Dockerfile.j2 | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index df6c17e..466abab 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -56,3 +56,4 @@ repos: rev: b3555ba9c2bfd9401e79f2f0da68dd1ae38e10c7 # 2.12.0 hooks: - id: hadolint + exclude: \.j2$ diff --git a/template/docker/Dockerfile.j2 b/template/docker/Dockerfile.j2 index 0410966..58e4467 100644 --- a/template/docker/Dockerfile.j2 +++ b/template/docker/Dockerfile.j2 @@ -101,9 +101,10 @@ EOF COPY LICENSE /licenses/LICENSE COPY --from=builder /app/* /usr/local/bin/ -# {[% if operator.include_productconfig is undefined or operator.include_productconfig == true %}] -COPY deploy/config-spec/properties.yaml /etc/stackable/{[operator.name}]/config-spec/properties.yaml -# {[% endif %}] + +{[% if operator.include_productconfig is undefined or operator.include_productconfig == true %}] +COPY deploy/config-spec/properties.yaml /etc/stackable/{[ operator.name }]/config-spec/properties.yaml +{[% endif %}] USER ${STACKABLE_USER_UID}