Skip to content

Commit

Permalink
Update base image to 3.12.1-alpine3.19 (#3266)
Browse files Browse the repository at this point in the history
* Update base image to 3.12.1-alpine3.19

* Use a newer revive version

* Update clang and revert revive

* Revert revive to 1.3.4

---------

Co-authored-by: nvuillam <[email protected]>
  • Loading branch information
bdovaz and nvuillam authored Jan 7, 2024
1 parent 9854dd5 commit beac2d6
Show file tree
Hide file tree
Showing 144 changed files with 152 additions and 152 deletions.
2 changes: 1 addition & 1 deletion .automation/generated/linter-versions.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"checkov": "3.1.54",
"checkstyle": "10.12.7",
"chktex": "1.7.8",
"clang-format": "16.0.6",
"clang-format": "17.0.5",
"clippy": "0.1.75",
"clj-kondo": "2023.12.15",
"cljstyle": "0.15.0",
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ FROM mvdan/shfmt:latest-alpine as shfmt
FROM hadolint/hadolint:v2.12.0-alpine as hadolint
FROM mstruebing/editorconfig-checker:2.7.2 as editorconfig-checker
FROM golang:1-alpine as revive
## The golang image used as a builder is a temporary workaround
## The golang image used as a builder is a temporary workaround (https://github.com/mgechev/revive/issues/787)
## for the released revive binaries not returning version numbers (devel).
## The install command should then be what is commented in the go.megalinter-descriptor.yml
RUN GOBIN=/usr/bin go install github.com/mgechev/revive@latest
Expand Down Expand Up @@ -49,7 +49,7 @@ FROM alpine/terragrunt:latest as terragrunt
##################
# Get base image #
##################
FROM python:3.12.0-alpine3.18
FROM python:3.12.1-alpine3.19
ARG GITHUB_TOKEN

#############################################################################################
Expand Down Expand Up @@ -107,7 +107,7 @@ RUN apk add --no-cache \
php81-simplexml \
dpkg \
py3-pyflakes \
clang16-extra-tools \
clang17-extra-tools \
nodejs \
npm \
yarn \
Expand Down
4 changes: 2 additions & 2 deletions flavors/c_cpp/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ FROM lycheeverse/lychee:latest-alpine as lychee
##################
# Get base image #
##################
FROM python:3.12.0-alpine3.18
FROM python:3.12.1-alpine3.19
ARG GITHUB_TOKEN

#############################################################################################
Expand Down Expand Up @@ -66,7 +66,7 @@ RUN apk add --no-cache \
openssh \
openjdk17 \
py3-pyflakes \
clang16-extra-tools \
clang17-extra-tools \
nodejs \
npm \
yarn \
Expand Down
2 changes: 1 addition & 1 deletion flavors/ci_light/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ FROM trufflesecurity/trufflehog:latest as trufflehog
##################
# Get base image #
##################
FROM python:3.12.0-alpine3.18
FROM python:3.12.1-alpine3.19
ARG GITHUB_TOKEN

#############################################################################################
Expand Down
4 changes: 2 additions & 2 deletions flavors/cupcake/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ FROM mvdan/shfmt:latest-alpine as shfmt
FROM hadolint/hadolint:v2.12.0-alpine as hadolint
FROM mstruebing/editorconfig-checker:2.7.2 as editorconfig-checker
FROM golang:1-alpine as revive
## The golang image used as a builder is a temporary workaround
## The golang image used as a builder is a temporary workaround (https://github.com/mgechev/revive/issues/787)
## for the released revive binaries not returning version numbers (devel).
## The install command should then be what is commented in the go.megalinter-descriptor.yml
RUN GOBIN=/usr/bin go install github.com/mgechev/revive@latest
Expand All @@ -44,7 +44,7 @@ FROM alpine/terragrunt:latest as terragrunt
##################
# Get base image #
##################
FROM python:3.12.0-alpine3.18
FROM python:3.12.1-alpine3.19
ARG GITHUB_TOKEN

#############################################################################################
Expand Down
2 changes: 1 addition & 1 deletion flavors/documentation/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ FROM lycheeverse/lychee:latest-alpine as lychee
##################
# Get base image #
##################
FROM python:3.12.0-alpine3.18
FROM python:3.12.1-alpine3.19
ARG GITHUB_TOKEN

#############################################################################################
Expand Down
2 changes: 1 addition & 1 deletion flavors/dotnet/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ FROM lycheeverse/lychee:latest-alpine as lychee
##################
# Get base image #
##################
FROM python:3.12.0-alpine3.18
FROM python:3.12.1-alpine3.19
ARG GITHUB_TOKEN

#############################################################################################
Expand Down
2 changes: 1 addition & 1 deletion flavors/dotnetweb/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ FROM lycheeverse/lychee:latest-alpine as lychee
##################
# Get base image #
##################
FROM python:3.12.0-alpine3.18
FROM python:3.12.1-alpine3.19
ARG GITHUB_TOKEN

#############################################################################################
Expand Down
2 changes: 1 addition & 1 deletion flavors/formatters/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ FROM alpine/terragrunt:latest as terragrunt
##################
# Get base image #
##################
FROM python:3.12.0-alpine3.18
FROM python:3.12.1-alpine3.19
ARG GITHUB_TOKEN

#############################################################################################
Expand Down
4 changes: 2 additions & 2 deletions flavors/go/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ FROM mvdan/shfmt:latest-alpine as shfmt
FROM hadolint/hadolint:v2.12.0-alpine as hadolint
FROM mstruebing/editorconfig-checker:2.7.2 as editorconfig-checker
FROM golang:1-alpine as revive
## The golang image used as a builder is a temporary workaround
## The golang image used as a builder is a temporary workaround (https://github.com/mgechev/revive/issues/787)
## for the released revive binaries not returning version numbers (devel).
## The install command should then be what is commented in the go.megalinter-descriptor.yml
RUN GOBIN=/usr/bin go install github.com/mgechev/revive@latest
Expand All @@ -39,7 +39,7 @@ FROM lycheeverse/lychee:latest-alpine as lychee
##################
# Get base image #
##################
FROM python:3.12.0-alpine3.18
FROM python:3.12.1-alpine3.19
ARG GITHUB_TOKEN

#############################################################################################
Expand Down
2 changes: 1 addition & 1 deletion flavors/java/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ FROM lycheeverse/lychee:latest-alpine as lychee
##################
# Get base image #
##################
FROM python:3.12.0-alpine3.18
FROM python:3.12.1-alpine3.19
ARG GITHUB_TOKEN

#############################################################################################
Expand Down
2 changes: 1 addition & 1 deletion flavors/javascript/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ FROM lycheeverse/lychee:latest-alpine as lychee
##################
# Get base image #
##################
FROM python:3.12.0-alpine3.18
FROM python:3.12.1-alpine3.19
ARG GITHUB_TOKEN

#############################################################################################
Expand Down
2 changes: 1 addition & 1 deletion flavors/php/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ FROM lycheeverse/lychee:latest-alpine as lychee
##################
# Get base image #
##################
FROM python:3.12.0-alpine3.18
FROM python:3.12.1-alpine3.19
ARG GITHUB_TOKEN

#############################################################################################
Expand Down
2 changes: 1 addition & 1 deletion flavors/python/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ FROM lycheeverse/lychee:latest-alpine as lychee
##################
# Get base image #
##################
FROM python:3.12.0-alpine3.18
FROM python:3.12.1-alpine3.19
ARG GITHUB_TOKEN

#############################################################################################
Expand Down
2 changes: 1 addition & 1 deletion flavors/ruby/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ FROM lycheeverse/lychee:latest-alpine as lychee
##################
# Get base image #
##################
FROM python:3.12.0-alpine3.18
FROM python:3.12.1-alpine3.19
ARG GITHUB_TOKEN

#############################################################################################
Expand Down
2 changes: 1 addition & 1 deletion flavors/rust/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ FROM lycheeverse/lychee:latest-alpine as lychee
##################
# Get base image #
##################
FROM python:3.12.0-alpine3.18
FROM python:3.12.1-alpine3.19
ARG GITHUB_TOKEN

#############################################################################################
Expand Down
2 changes: 1 addition & 1 deletion flavors/salesforce/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ FROM lycheeverse/lychee:latest-alpine as lychee
##################
# Get base image #
##################
FROM python:3.12.0-alpine3.18
FROM python:3.12.1-alpine3.19
ARG GITHUB_TOKEN

#############################################################################################
Expand Down
2 changes: 1 addition & 1 deletion flavors/security/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ FROM alpine/terragrunt:latest as terragrunt
##################
# Get base image #
##################
FROM python:3.12.0-alpine3.18
FROM python:3.12.1-alpine3.19
ARG GITHUB_TOKEN

#############################################################################################
Expand Down
2 changes: 1 addition & 1 deletion flavors/swift/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ FROM lycheeverse/lychee:latest-alpine as lychee
##################
# Get base image #
##################
FROM python:3.12.0-alpine3.18
FROM python:3.12.1-alpine3.19
ARG GITHUB_TOKEN

#############################################################################################
Expand Down
2 changes: 1 addition & 1 deletion flavors/terraform/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ FROM alpine/terragrunt:latest as terragrunt
##################
# Get base image #
##################
FROM python:3.12.0-alpine3.18
FROM python:3.12.1-alpine3.19
ARG GITHUB_TOKEN

#############################################################################################
Expand Down
2 changes: 1 addition & 1 deletion linters/action_actionlint/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ FROM koalaman/shellcheck:stable as shellcheck
##################
# Get base image #
##################
FROM python:3.12.0-alpine3.18
FROM python:3.12.1-alpine3.19
ARG GITHUB_TOKEN

#############################################################################################
Expand Down
2 changes: 1 addition & 1 deletion linters/ansible_ansible_lint/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
##################
# Get base image #
##################
FROM python:3.12.0-alpine3.18
FROM python:3.12.1-alpine3.19
ARG GITHUB_TOKEN

#############################################################################################
Expand Down
2 changes: 1 addition & 1 deletion linters/arm_arm_ttk/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
##################
# Get base image #
##################
FROM python:3.12.0-alpine3.18
FROM python:3.12.1-alpine3.19
ARG GITHUB_TOKEN

#############################################################################################
Expand Down
2 changes: 1 addition & 1 deletion linters/bash_exec/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
##################
# Get base image #
##################
FROM python:3.12.0-alpine3.18
FROM python:3.12.1-alpine3.19
ARG GITHUB_TOKEN

#############################################################################################
Expand Down
2 changes: 1 addition & 1 deletion linters/bash_shellcheck/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ FROM koalaman/shellcheck:stable as shellcheck
##################
# Get base image #
##################
FROM python:3.12.0-alpine3.18
FROM python:3.12.1-alpine3.19
ARG GITHUB_TOKEN

#############################################################################################
Expand Down
2 changes: 1 addition & 1 deletion linters/bash_shfmt/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ FROM mvdan/shfmt:latest-alpine as shfmt
##################
# Get base image #
##################
FROM python:3.12.0-alpine3.18
FROM python:3.12.1-alpine3.19
ARG GITHUB_TOKEN

#############################################################################################
Expand Down
2 changes: 1 addition & 1 deletion linters/bicep_bicep_linter/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
##################
# Get base image #
##################
FROM python:3.12.0-alpine3.18
FROM python:3.12.1-alpine3.19
ARG GITHUB_TOKEN

#############################################################################################
Expand Down
4 changes: 2 additions & 2 deletions linters/c_clang_format/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
##################
# Get base image #
##################
FROM python:3.12.0-alpine3.18
FROM python:3.12.1-alpine3.19
ARG GITHUB_TOKEN

#############################################################################################
Expand Down Expand Up @@ -48,7 +48,7 @@ RUN apk add --no-cache \
make \
musl-dev \
openssh \
clang16-extra-tools \
clang17-extra-tools \
&& git config --global core.autocrlf true
#APK__END

Expand Down
2 changes: 1 addition & 1 deletion linters/c_cpplint/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
##################
# Get base image #
##################
FROM python:3.12.0-alpine3.18
FROM python:3.12.1-alpine3.19
ARG GITHUB_TOKEN

#############################################################################################
Expand Down
2 changes: 1 addition & 1 deletion linters/clojure_clj_kondo/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
##################
# Get base image #
##################
FROM python:3.12.0-alpine3.18
FROM python:3.12.1-alpine3.19
ARG GITHUB_TOKEN

#############################################################################################
Expand Down
2 changes: 1 addition & 1 deletion linters/clojure_cljstyle/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
##################
# Get base image #
##################
FROM python:3.12.0-alpine3.18
FROM python:3.12.1-alpine3.19
ARG GITHUB_TOKEN

#############################################################################################
Expand Down
2 changes: 1 addition & 1 deletion linters/cloudformation_cfn_lint/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
##################
# Get base image #
##################
FROM python:3.12.0-alpine3.18
FROM python:3.12.1-alpine3.19
ARG GITHUB_TOKEN

#############################################################################################
Expand Down
2 changes: 1 addition & 1 deletion linters/coffee_coffeelint/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
##################
# Get base image #
##################
FROM python:3.12.0-alpine3.18
FROM python:3.12.1-alpine3.19
ARG GITHUB_TOKEN

#############################################################################################
Expand Down
2 changes: 1 addition & 1 deletion linters/copypaste_jscpd/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
##################
# Get base image #
##################
FROM python:3.12.0-alpine3.18
FROM python:3.12.1-alpine3.19
ARG GITHUB_TOKEN

#############################################################################################
Expand Down
4 changes: 2 additions & 2 deletions linters/cpp_clang_format/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
##################
# Get base image #
##################
FROM python:3.12.0-alpine3.18
FROM python:3.12.1-alpine3.19
ARG GITHUB_TOKEN

#############################################################################################
Expand Down Expand Up @@ -48,7 +48,7 @@ RUN apk add --no-cache \
make \
musl-dev \
openssh \
clang16-extra-tools \
clang17-extra-tools \
&& git config --global core.autocrlf true
#APK__END

Expand Down
2 changes: 1 addition & 1 deletion linters/cpp_cpplint/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
##################
# Get base image #
##################
FROM python:3.12.0-alpine3.18
FROM python:3.12.1-alpine3.19
ARG GITHUB_TOKEN

#############################################################################################
Expand Down
2 changes: 1 addition & 1 deletion linters/csharp_csharpier/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
##################
# Get base image #
##################
FROM python:3.12.0-alpine3.18
FROM python:3.12.1-alpine3.19
ARG GITHUB_TOKEN

#############################################################################################
Expand Down
Loading

0 comments on commit beac2d6

Please sign in to comment.