feat: enable dotenv-linter for slim images (#5868)

Set up dotenv-linter for the slim image, and not only for the standard
image because it doesn't have dependencies on the Rust SDK, and weights
less than 10MB.
This commit is contained in:
Marco Ferrari 2024-07-10 15:50:15 +02:00 committed by GitHub
parent bcf8ca82ad
commit c770a8d253
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 10 additions and 12 deletions

View file

@ -105,6 +105,10 @@ jobs:
run: | run: |
docker load <"/tmp/${{ env.CONTAINER_IMAGE_OUTPUT_IMAGE_NAME }}.tar" docker load <"/tmp/${{ env.CONTAINER_IMAGE_OUTPUT_IMAGE_NAME }}.tar"
- name: Print environment info
run: |
make info
# Validate the container image labels here so we don't have to pass the expected # Validate the container image labels here so we don't have to pass the expected
# label values to other build jobs # label values to other build jobs
- name: Validate container image labels - name: Validate container image labels
@ -152,10 +156,6 @@ jobs:
docker load --input /tmp/${{ env.CONTAINER_IMAGE_OUTPUT_IMAGE_NAME }}.tar docker load --input /tmp/${{ env.CONTAINER_IMAGE_OUTPUT_IMAGE_NAME }}.tar
docker image ls -a docker image ls -a
- name: Print environment info
run: |
make info
- name: Update action.yml - name: Update action.yml
run: | run: |
echo "yq version: $(yq --version)" echo "yq version: $(yq --version)"

View file

@ -386,6 +386,11 @@ COPY --from=lintr-installer /usr/lib/R /usr/lib/R
##################### #####################
COPY --chmod=555 scripts/bash-exec.sh /usr/bin/bash-exec COPY --chmod=555 scripts/bash-exec.sh /usr/bin/bash-exec
#########################
# Install dotenv-linter #
#########################
COPY --from=dotenv-linter /dotenv-linter /usr/bin/
######################### #########################
# Configure Environment # # Configure Environment #
######################### #########################
@ -465,11 +470,6 @@ RUN apk add --no-cache \
COPY scripts/clippy.sh /usr/bin/clippy COPY scripts/clippy.sh /usr/bin/clippy
RUN chmod +x /usr/bin/clippy RUN chmod +x /usr/bin/clippy
#########################
# Install dotenv-linter #
#########################
COPY --from=dotenv-linter /dotenv-linter /usr/bin/
################################### ###################################
# Install DotNet and Dependencies # # Install DotNet and Dependencies #
################################### ###################################

View file

@ -179,7 +179,6 @@ Super-Linter provides several variants:
- `slim`: `super-linter/super-linter/slim@[VERSION]`: includes all supported linters except: - `slim`: `super-linter/super-linter/slim@[VERSION]`: includes all supported linters except:
- `rust` linters - `rust` linters
- `dotenv` linters
- `armttk` linters - `armttk` linters
- `pwsh` linters - `pwsh` linters
- `c#` linters - `c#` linters

View file

@ -20,6 +20,7 @@ LINTER_NAMES_ARRAY['CSS']="stylelint"
LINTER_NAMES_ARRAY['DART']="dart" LINTER_NAMES_ARRAY['DART']="dart"
LINTER_NAMES_ARRAY['DOCKERFILE_HADOLINT']="hadolint" LINTER_NAMES_ARRAY['DOCKERFILE_HADOLINT']="hadolint"
LINTER_NAMES_ARRAY['EDITORCONFIG']="editorconfig-checker" LINTER_NAMES_ARRAY['EDITORCONFIG']="editorconfig-checker"
LINTER_NAMES_ARRAY['ENV']="dotenv-linter"
LINTER_NAMES_ARRAY['GITHUB_ACTIONS']="actionlint" LINTER_NAMES_ARRAY['GITHUB_ACTIONS']="actionlint"
LINTER_NAMES_ARRAY['GITLEAKS']="gitleaks" LINTER_NAMES_ARRAY['GITLEAKS']="gitleaks"
LINTER_NAMES_ARRAY['GHERKIN']="gherkin-lint" LINTER_NAMES_ARRAY['GHERKIN']="gherkin-lint"
@ -82,7 +83,6 @@ LINTER_NAMES_ARRAY['YAML']="yamllint"
if [[ "${IMAGE}" == "standard" ]]; then if [[ "${IMAGE}" == "standard" ]]; then
LINTER_NAMES_ARRAY['ARM']="arm-ttk" LINTER_NAMES_ARRAY['ARM']="arm-ttk"
LINTER_NAMES_ARRAY['CSHARP']="dotnet" LINTER_NAMES_ARRAY['CSHARP']="dotnet"
LINTER_NAMES_ARRAY['ENV']="dotenv-linter"
LINTER_NAMES_ARRAY['POWERSHELL']="pwsh" LINTER_NAMES_ARRAY['POWERSHELL']="pwsh"
LINTER_NAMES_ARRAY['RUST_2015']="rustfmt" LINTER_NAMES_ARRAY['RUST_2015']="rustfmt"
LINTER_NAMES_ARRAY['RUST_2018']="rustfmt" LINTER_NAMES_ARRAY['RUST_2018']="rustfmt"

View file

@ -214,7 +214,6 @@ control "super-linter-installed-commands" do
arm-ttk arm-ttk
clippy clippy
dotnet dotnet
dotenv-linter
pwsh pwsh
rustfmt rustfmt
) )