From a9f55fd06018dd6c97f28917981ef299a52a7d1c Mon Sep 17 00:00:00 2001 From: Nick Larsen Date: Tue, 17 Sep 2024 21:26:26 +0200 Subject: [PATCH 1/2] ci(pre-commit): Ignore j2 files for hadolint hook --- .pre-commit-config.yaml | 1 + template/docker/Dockerfile.j2 | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index df6c17ea..466abab0 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 04109662..6d8bfb41 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 %}] + +{[% 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 %}] +{[% endif %}] USER ${STACKABLE_USER_UID} From c079eacfea5e5cc15bcfef8e9d8efb715b00ac42 Mon Sep 17 00:00:00 2001 From: Nick Larsen Date: Tue, 17 Sep 2024 21:30:28 +0200 Subject: [PATCH 2/2] chore(template): Add spaces back into variable interpolation (to make it what it was before recent broken changes). --- template/docker/Dockerfile.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template/docker/Dockerfile.j2 b/template/docker/Dockerfile.j2 index 6d8bfb41..58e44677 100644 --- a/template/docker/Dockerfile.j2 +++ b/template/docker/Dockerfile.j2 @@ -103,7 +103,7 @@ 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 +COPY deploy/config-spec/properties.yaml /etc/stackable/{[ operator.name }]/config-spec/properties.yaml {[% endif %}] USER ${STACKABLE_USER_UID}