diff --git a/Dockerfile b/Dockerfile index 22dd0f4a..f44bfa53 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,17 +1,17 @@ # syntax=docker/dockerfile:1 -# TARGETPLATFORM is special cased by docker and doesn't need the inital ARG +# TARGETPLATFORM is special cased by docker and doesn't need the initial ARG # https://docs.docker.com/engine/reference/builder/#automatic-platform-args-in-the-global-scope -FROM --platform=$TARGETPLATFORM ghcr.io/yannh/kubeconform:v0.6.3 as kubeconform +FROM --platform=$TARGETPLATFORM ghcr.io/yannh/kubeconform:v0.6.6-alpine as kubeconform ARG TARGETPLATFORM FROM --platform=$TARGETPLATFORM hadolint/hadolint:v2.12.0-alpine as hadolint ARG TARGETPLATFORM -FROM --platform=$TARGETPLATFORM koalaman/shellcheck:v0.9.0 as shellcheck +FROM --platform=$TARGETPLATFORM koalaman/shellcheck:v0.10.0 as shellcheck ARG TARGETPLATFORM -FROM --platform=$TARGETPLATFORM rhysd/actionlint:1.6.25 as actionlint +FROM --platform=$TARGETPLATFORM rhysd/actionlint:1.7.1 as actionlint ARG TARGETPLATFORM -FROM --platform=$TARGETPLATFORM python:3.11-alpine3.18 as base_image +FROM --platform=$TARGETPLATFORM python:3.11-alpine3.20 as base_image ENV LANG=C.UTF-8 ENV LC_ALL=C.UTF-8 diff --git a/Taskfile.yml b/Taskfile.yml index e7c95bd1..9044e40e 100644 --- a/Taskfile.yml +++ b/Taskfile.yml @@ -163,6 +163,7 @@ tasks: desc: Clean up build artifacts, cache files/directories, temp files, etc. cmds: - task: bash:clean + - rm -rf {{.ROOT_DIR}}/node_modules release: desc: Cut a project release diff --git a/entrypoint.sh b/entrypoint.sh index 378aeb71..679bf9e3 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -455,7 +455,7 @@ function rerun_lint() { } function initiate_code_review() { - if [ -n "$GITHUB_ACTIONS" ]; then + if [[ -n ${GITHUB_ACTIONS:+x} ]]; then # Run the Python script python /opt/goat/bin/code_review.py fi