Skip to content

Commit

Permalink
Upgrade python version (#2312)
Browse files Browse the repository at this point in the history
* Upgrade python version

* cspell

* [MegaLinter] Apply linters fixes

* Upgrade dart & glibc versions

Workaround for sgerrand/alpine-pkg-glibc#185

* Update used by

* Build

* Do not try to upgrade dartanalyzer

* checkov config

---------

Co-authored-by: nvuillam <nvuillam@users.noreply.github.com>
  • Loading branch information
nvuillam and nvuillam authored Feb 6, 2023
1 parent a04bd73 commit 367e77c
Show file tree
Hide file tree
Showing 48 changed files with 59 additions and 49 deletions.
2 changes: 1 addition & 1 deletion .automation/build.py
Original file line number Diff line number Diff line change
Expand Up @@ -2292,7 +2292,7 @@ def finalize_doc_build():
[![Docker Pulls](https://img.shields.io/badge/docker%20pulls-4.0M-blue?color=%23FD80CD)](https://megalinter.github.io/flavors/)
[![Downloads/week](https://img.shields.io/npm/dw/mega-linter-runner.svg?color=%23FD80CD)](https://npmjs.org/package/mega-linter-runner)
[![GitHub stars](https://img.shields.io/github/stars/oxsecurity/megalinter?cacheSeconds=3600&color=%23FD80CD)](https://github.com/oxsecurity/megalinter/stargazers/)
[![Dependents](https://img.shields.io/static/v1?label=Used%20by&message=1690&color=%23FD80CD&logo=slickpic)](https://github.com/oxsecurity/megalinter/network/dependents)
[![Dependents](https://img.shields.io/static/v1?label=Used%20by&message=2011&color=%23FD80CD&logo=slickpic)](https://github.com/oxsecurity/megalinter/network/dependents)
[![GitHub contributors](https://img.shields.io/github/contributors/oxsecurity/megalinter.svg?color=%23FD80CD)](https://github.com/oxsecurity/megalinter/graphs/contributors/)
[![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat-square&color=%23FD80CD)](http://makeapullrequest.com)""", # noqa: E501
)
Expand Down
1 change: 1 addition & 0 deletions .github/linters/.checkov.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@ skip-check:
- CKV_DOCKER_3
- CKV_DOCKER_7
- CKV_GHA_2
- CKV2_GHA_1
7 changes: 6 additions & 1 deletion .github/linters/.cspell.json
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@
"DRMAA",
"DTDs",
"DUSTILOCK",
"Deneuve",
"Dependabot",
"Detekt",
"Devcontainer",
Expand All @@ -123,6 +124,7 @@
"Ekubernetes",
"Emegalinter",
"Envir",
"Etienne",
"Excpt",
"FATA",
"FILEIO",
Expand Down Expand Up @@ -190,6 +192,7 @@
"LINTR",
"LOCALFOLDER",
"LUACHECK",
"Laven",
"Lfiles",
"Libxml",
"Lintr",
Expand Down Expand Up @@ -522,6 +525,7 @@
"customrules",
"cyclomatic",
"dartanalyzer",
"davidjeddy",
"debugent",
"decamelize",
"dedup",
Expand Down Expand Up @@ -678,6 +682,7 @@
"goodcheck",
"goodwithtech",
"gosec",
"gotit",
"govet",
"gridftp",
"grimmjo",
Expand Down Expand Up @@ -778,7 +783,6 @@
"kxdddddddoc",
"lacheck",
"langserver",
"Laven",
"leavevmode",
"leveldb",
"levn",
Expand Down Expand Up @@ -995,6 +999,7 @@
"pipeverb",
"pipfile",
"pipvenv",
"pjungermann",
"pkgs",
"plone",
"pluggable",
Expand Down
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),

Note: Can be used with `oxsecurity/megalinter@beta` in your GitHub Action mega-linter.yml file, or with `oxsecurity/megalinter:beta` docker image

- Core
- Upgrade base docker image from python:3.10.4-alpine3.16 to python:3.11.1-alpine3.17

- Linter versions upgrades
- [golangci-lint](https://golangci-lint.run/) from 1.51.0 to **1.51.1** on 2023-02-06
- [cspell](https://github.com/streetsidesoftware/cspell/tree/master/packages/cspell) from 6.21.0 to **6.22.0** on 2023-02-06
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ FROM checkmarx/kics:alpine as kics
# Get base image #
##################
# 3.10.5 is not usable until https://github.com/jruere/multiprocessing-logging/issues/56 is fixed
FROM python:3.10.4-alpine3.16
FROM python:3.11.1-alpine3.17

#############################################################################################
## @generated by .automation/build.py using descriptor files, please do not update manually ##
Expand All @@ -42,7 +42,7 @@ ARG BICEP_EXE='bicep'
ARG BICEP_URI='https://github.com/Azure/bicep/releases/latest/download/bicep-linux-musl-x64'
ARG BICEP_DIR='/usr/local/bin'
ARG DART_VERSION='2.8.4'
ARG GLIBC_VERSION='2.31-r0'
ARG GLIBC_VERSION='2.34-r0'
ARG PMD_VERSION=6.48.0
ARG PSSA_VERSION='latest'
#ARG__END
Expand Down Expand Up @@ -410,7 +410,7 @@ RUN curl --retry 5 --retry-delay 5 -sLO "${ARM_TTK_URI}" \
# dartanalyzer installation
&& wget --tries=50 -q -O /etc/apk/keys/sgerrand.rsa.pub https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub \
&& wget --tries=5 -q https://github.com/sgerrand/alpine-pkg-glibc/releases/download/${GLIBC_VERSION}/glibc-${GLIBC_VERSION}.apk \
&& apk add --no-cache glibc-${GLIBC_VERSION}.apk && rm glibc-${GLIBC_VERSION}.apk \
&& apk add --force-overwrite --no-cache glibc-${GLIBC_VERSION}.apk && rm glibc-${GLIBC_VERSION}.apk \
&& wget --tries=5 https://storage.googleapis.com/dart-archive/channels/stable/release/${DART_VERSION}/sdk/dartsdk-linux-x64-release.zip -O - -q | unzip -q - \
&& chmod +x dart-sdk/bin/dart* \
&& mv dart-sdk/bin/* /usr/bin/ && mv dart-sdk/lib/* /usr/lib/ && mv dart-sdk/include/* /usr/include/ \
Expand Down
2 changes: 1 addition & 1 deletion flavors/ci_light/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ FROM zricethezav/gitleaks:v8.15.3 as gitleaks
# Get base image #
##################
# 3.10.5 is not usable until https://github.com/jruere/multiprocessing-logging/issues/56 is fixed
FROM python:3.10.4-alpine3.16
FROM python:3.11.1-alpine3.17

#############################################################################################
## @generated by .automation/build.py using descriptor files, please do not update manually ##
Expand Down
2 changes: 1 addition & 1 deletion flavors/cupcake/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ FROM checkmarx/kics:alpine as kics
# Get base image #
##################
# 3.10.5 is not usable until https://github.com/jruere/multiprocessing-logging/issues/56 is fixed
FROM python:3.10.4-alpine3.16
FROM python:3.11.1-alpine3.17

#############################################################################################
## @generated by .automation/build.py using descriptor files, please do not update manually ##
Expand Down
2 changes: 1 addition & 1 deletion flavors/documentation/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ FROM zricethezav/gitleaks:v8.15.3 as gitleaks
# Get base image #
##################
# 3.10.5 is not usable until https://github.com/jruere/multiprocessing-logging/issues/56 is fixed
FROM python:3.10.4-alpine3.16
FROM python:3.11.1-alpine3.17

#############################################################################################
## @generated by .automation/build.py using descriptor files, please do not update manually ##
Expand Down
2 changes: 1 addition & 1 deletion flavors/dotnet/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ FROM zricethezav/gitleaks:v8.15.3 as gitleaks
# Get base image #
##################
# 3.10.5 is not usable until https://github.com/jruere/multiprocessing-logging/issues/56 is fixed
FROM python:3.10.4-alpine3.16
FROM python:3.11.1-alpine3.17

#############################################################################################
## @generated by .automation/build.py using descriptor files, please do not update manually ##
Expand Down
2 changes: 1 addition & 1 deletion flavors/go/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ FROM zricethezav/gitleaks:v8.15.3 as gitleaks
# Get base image #
##################
# 3.10.5 is not usable until https://github.com/jruere/multiprocessing-logging/issues/56 is fixed
FROM python:3.10.4-alpine3.16
FROM python:3.11.1-alpine3.17

#############################################################################################
## @generated by .automation/build.py using descriptor files, please do not update manually ##
Expand Down
2 changes: 1 addition & 1 deletion flavors/java/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ FROM zricethezav/gitleaks:v8.15.3 as gitleaks
# Get base image #
##################
# 3.10.5 is not usable until https://github.com/jruere/multiprocessing-logging/issues/56 is fixed
FROM python:3.10.4-alpine3.16
FROM python:3.11.1-alpine3.17

#############################################################################################
## @generated by .automation/build.py using descriptor files, please do not update manually ##
Expand Down
2 changes: 1 addition & 1 deletion flavors/javascript/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ FROM zricethezav/gitleaks:v8.15.3 as gitleaks
# Get base image #
##################
# 3.10.5 is not usable until https://github.com/jruere/multiprocessing-logging/issues/56 is fixed
FROM python:3.10.4-alpine3.16
FROM python:3.11.1-alpine3.17

#############################################################################################
## @generated by .automation/build.py using descriptor files, please do not update manually ##
Expand Down
2 changes: 1 addition & 1 deletion flavors/php/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ FROM zricethezav/gitleaks:v8.15.3 as gitleaks
# Get base image #
##################
# 3.10.5 is not usable until https://github.com/jruere/multiprocessing-logging/issues/56 is fixed
FROM python:3.10.4-alpine3.16
FROM python:3.11.1-alpine3.17

#############################################################################################
## @generated by .automation/build.py using descriptor files, please do not update manually ##
Expand Down
2 changes: 1 addition & 1 deletion flavors/python/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ FROM zricethezav/gitleaks:v8.15.3 as gitleaks
# Get base image #
##################
# 3.10.5 is not usable until https://github.com/jruere/multiprocessing-logging/issues/56 is fixed
FROM python:3.10.4-alpine3.16
FROM python:3.11.1-alpine3.17

#############################################################################################
## @generated by .automation/build.py using descriptor files, please do not update manually ##
Expand Down
2 changes: 1 addition & 1 deletion flavors/ruby/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ FROM zricethezav/gitleaks:v8.15.3 as gitleaks
# Get base image #
##################
# 3.10.5 is not usable until https://github.com/jruere/multiprocessing-logging/issues/56 is fixed
FROM python:3.10.4-alpine3.16
FROM python:3.11.1-alpine3.17

#############################################################################################
## @generated by .automation/build.py using descriptor files, please do not update manually ##
Expand Down
2 changes: 1 addition & 1 deletion flavors/rust/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ FROM zricethezav/gitleaks:v8.15.3 as gitleaks
# Get base image #
##################
# 3.10.5 is not usable until https://github.com/jruere/multiprocessing-logging/issues/56 is fixed
FROM python:3.10.4-alpine3.16
FROM python:3.11.1-alpine3.17

#############################################################################################
## @generated by .automation/build.py using descriptor files, please do not update manually ##
Expand Down
2 changes: 1 addition & 1 deletion flavors/salesforce/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ FROM zricethezav/gitleaks:v8.15.3 as gitleaks
# Get base image #
##################
# 3.10.5 is not usable until https://github.com/jruere/multiprocessing-logging/issues/56 is fixed
FROM python:3.10.4-alpine3.16
FROM python:3.11.1-alpine3.17

#############################################################################################
## @generated by .automation/build.py using descriptor files, please do not update manually ##
Expand Down
2 changes: 1 addition & 1 deletion flavors/security/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ FROM checkmarx/kics:alpine as kics
# Get base image #
##################
# 3.10.5 is not usable until https://github.com/jruere/multiprocessing-logging/issues/56 is fixed
FROM python:3.10.4-alpine3.16
FROM python:3.11.1-alpine3.17

#############################################################################################
## @generated by .automation/build.py using descriptor files, please do not update manually ##
Expand Down
2 changes: 1 addition & 1 deletion flavors/swift/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ FROM zricethezav/gitleaks:v8.15.3 as gitleaks
# Get base image #
##################
# 3.10.5 is not usable until https://github.com/jruere/multiprocessing-logging/issues/56 is fixed
FROM python:3.10.4-alpine3.16
FROM python:3.11.1-alpine3.17

#############################################################################################
## @generated by .automation/build.py using descriptor files, please do not update manually ##
Expand Down
2 changes: 1 addition & 1 deletion flavors/terraform/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ FROM checkmarx/kics:alpine as kics
# Get base image #
##################
# 3.10.5 is not usable until https://github.com/jruere/multiprocessing-logging/issues/56 is fixed
FROM python:3.10.4-alpine3.16
FROM python:3.11.1-alpine3.17

#############################################################################################
## @generated by .automation/build.py using descriptor files, please do not update manually ##
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 #
##################
# 3.10.5 is not usable until https://github.com/jruere/multiprocessing-logging/issues/56 is fixed
FROM python:3.10.4-alpine3.16
FROM python:3.11.1-alpine3.17

#############################################################################################
## @generated by .automation/build.py using descriptor files, please do not update manually ##
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 @@
# Get base image #
##################
# 3.10.5 is not usable until https://github.com/jruere/multiprocessing-logging/issues/56 is fixed
FROM python:3.10.4-alpine3.16
FROM python:3.11.1-alpine3.17

#############################################################################################
## @generated by .automation/build.py using descriptor files, please do not update manually ##
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 #
##################
# 3.10.5 is not usable until https://github.com/jruere/multiprocessing-logging/issues/56 is fixed
FROM python:3.10.4-alpine3.16
FROM python:3.11.1-alpine3.17

#############################################################################################
## @generated by .automation/build.py using descriptor files, please do not update manually ##
Expand Down
2 changes: 1 addition & 1 deletion linters/dockerfile_hadolint/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ FROM hadolint/hadolint:v2.12.0-alpine as hadolint
# Get base image #
##################
# 3.10.5 is not usable until https://github.com/jruere/multiprocessing-logging/issues/56 is fixed
FROM python:3.10.4-alpine3.16
FROM python:3.11.1-alpine3.17

#############################################################################################
## @generated by .automation/build.py using descriptor files, please do not update manually ##
Expand Down
2 changes: 1 addition & 1 deletion linters/go_revive/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
# Get base image #
##################
# 3.10.5 is not usable until https://github.com/jruere/multiprocessing-logging/issues/56 is fixed
FROM python:3.10.4-alpine3.16
FROM python:3.11.1-alpine3.17

#############################################################################################
## @generated by .automation/build.py using descriptor files, please do not update manually ##
Expand Down
2 changes: 1 addition & 1 deletion linters/groovy_npm_groovy_lint/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
# Get base image #
##################
# 3.10.5 is not usable until https://github.com/jruere/multiprocessing-logging/issues/56 is fixed
FROM python:3.10.4-alpine3.16
FROM python:3.11.1-alpine3.17

#############################################################################################
## @generated by .automation/build.py using descriptor files, please do not update manually ##
Expand Down
2 changes: 1 addition & 1 deletion linters/java_checkstyle/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
# Get base image #
##################
# 3.10.5 is not usable until https://github.com/jruere/multiprocessing-logging/issues/56 is fixed
FROM python:3.10.4-alpine3.16
FROM python:3.11.1-alpine3.17

#############################################################################################
## @generated by .automation/build.py using descriptor files, please do not update manually ##
Expand Down
2 changes: 1 addition & 1 deletion linters/java_pmd/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
# Get base image #
##################
# 3.10.5 is not usable until https://github.com/jruere/multiprocessing-logging/issues/56 is fixed
FROM python:3.10.4-alpine3.16
FROM python:3.11.1-alpine3.17

#############################################################################################
## @generated by .automation/build.py using descriptor files, please do not update manually ##
Expand Down
2 changes: 1 addition & 1 deletion linters/javascript_es/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
# Get base image #
##################
# 3.10.5 is not usable until https://github.com/jruere/multiprocessing-logging/issues/56 is fixed
FROM python:3.10.4-alpine3.16
FROM python:3.11.1-alpine3.17

#############################################################################################
## @generated by .automation/build.py using descriptor files, please do not update manually ##
Expand Down
2 changes: 1 addition & 1 deletion linters/json_eslint_plugin_jsonc/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
# Get base image #
##################
# 3.10.5 is not usable until https://github.com/jruere/multiprocessing-logging/issues/56 is fixed
FROM python:3.10.4-alpine3.16
FROM python:3.11.1-alpine3.17

#############################################################################################
## @generated by .automation/build.py using descriptor files, please do not update manually ##
Expand Down
2 changes: 1 addition & 1 deletion linters/jsx_eslint/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
# Get base image #
##################
# 3.10.5 is not usable until https://github.com/jruere/multiprocessing-logging/issues/56 is fixed
FROM python:3.10.4-alpine3.16
FROM python:3.11.1-alpine3.17

#############################################################################################
## @generated by .automation/build.py using descriptor files, please do not update manually ##
Expand Down
2 changes: 1 addition & 1 deletion linters/kotlin_ktlint/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
# Get base image #
##################
# 3.10.5 is not usable until https://github.com/jruere/multiprocessing-logging/issues/56 is fixed
FROM python:3.10.4-alpine3.16
FROM python:3.11.1-alpine3.17

#############################################################################################
## @generated by .automation/build.py using descriptor files, please do not update manually ##
Expand Down
2 changes: 1 addition & 1 deletion linters/php_psalm/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
# Get base image #
##################
# 3.10.5 is not usable until https://github.com/jruere/multiprocessing-logging/issues/56 is fixed
FROM python:3.10.4-alpine3.16
FROM python:3.11.1-alpine3.17

#############################################################################################
## @generated by .automation/build.py using descriptor files, please do not update manually ##
Expand Down
2 changes: 1 addition & 1 deletion linters/python_bandit/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
# Get base image #
##################
# 3.10.5 is not usable until https://github.com/jruere/multiprocessing-logging/issues/56 is fixed
FROM python:3.10.4-alpine3.16
FROM python:3.11.1-alpine3.17

#############################################################################################
## @generated by .automation/build.py using descriptor files, please do not update manually ##
Expand Down
2 changes: 1 addition & 1 deletion linters/repository_checkov/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
# Get base image #
##################
# 3.10.5 is not usable until https://github.com/jruere/multiprocessing-logging/issues/56 is fixed
FROM python:3.10.4-alpine3.16
FROM python:3.11.1-alpine3.17

#############################################################################################
## @generated by .automation/build.py using descriptor files, please do not update manually ##
Expand Down
2 changes: 1 addition & 1 deletion linters/repository_devskim/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
# Get base image #
##################
# 3.10.5 is not usable until https://github.com/jruere/multiprocessing-logging/issues/56 is fixed
FROM python:3.10.4-alpine3.16
FROM python:3.11.1-alpine3.17

#############################################################################################
## @generated by .automation/build.py using descriptor files, please do not update manually ##
Expand Down
2 changes: 1 addition & 1 deletion linters/repository_dustilock/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
# Get base image #
##################
# 3.10.5 is not usable until https://github.com/jruere/multiprocessing-logging/issues/56 is fixed
FROM python:3.10.4-alpine3.16
FROM python:3.11.1-alpine3.17

#############################################################################################
## @generated by .automation/build.py using descriptor files, please do not update manually ##
Expand Down
Loading

0 comments on commit 367e77c

Please sign in to comment.