Skip to content

Commit 367e77c

Browse files
authored
Upgrade python version (#2312)
* Upgrade python version * cspell * [MegaLinter] Apply linters fixes * Upgrade dart & glibc versions Workaround for https://github.com/sgerrand/alpine-pkg-glibc/issues/185 * Update used by * Build * Do not try to upgrade dartanalyzer * checkov config --------- Co-authored-by: nvuillam <[email protected]>
1 parent a04bd73 commit 367e77c

File tree

48 files changed

+59
-49
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+59
-49
lines changed

.automation/build.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2292,7 +2292,7 @@ def finalize_doc_build():
22922292
[![Docker Pulls](https://img.shields.io/badge/docker%20pulls-4.0M-blue?color=%23FD80CD)](https://megalinter.github.io/flavors/)
22932293
[![Downloads/week](https://img.shields.io/npm/dw/mega-linter-runner.svg?color=%23FD80CD)](https://npmjs.org/package/mega-linter-runner)
22942294
[![GitHub stars](https://img.shields.io/github/stars/oxsecurity/megalinter?cacheSeconds=3600&color=%23FD80CD)](https://github.com/oxsecurity/megalinter/stargazers/)
2295-
[![Dependents](https://img.shields.io/static/v1?label=Used%20by&message=1690&color=%23FD80CD&logo=slickpic)](https://github.com/oxsecurity/megalinter/network/dependents)
2295+
[![Dependents](https://img.shields.io/static/v1?label=Used%20by&message=2011&color=%23FD80CD&logo=slickpic)](https://github.com/oxsecurity/megalinter/network/dependents)
22962296
[![GitHub contributors](https://img.shields.io/github/contributors/oxsecurity/megalinter.svg?color=%23FD80CD)](https://github.com/oxsecurity/megalinter/graphs/contributors/)
22972297
[![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat-square&color=%23FD80CD)](http://makeapullrequest.com)""", # noqa: E501
22982298
)

.github/linters/.checkov.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,4 @@ skip-check:
66
- CKV_DOCKER_3
77
- CKV_DOCKER_7
88
- CKV_GHA_2
9+
- CKV2_GHA_1

.github/linters/.cspell.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@
104104
"DRMAA",
105105
"DTDs",
106106
"DUSTILOCK",
107+
"Deneuve",
107108
"Dependabot",
108109
"Detekt",
109110
"Devcontainer",
@@ -123,6 +124,7 @@
123124
"Ekubernetes",
124125
"Emegalinter",
125126
"Envir",
127+
"Etienne",
126128
"Excpt",
127129
"FATA",
128130
"FILEIO",
@@ -190,6 +192,7 @@
190192
"LINTR",
191193
"LOCALFOLDER",
192194
"LUACHECK",
195+
"Laven",
193196
"Lfiles",
194197
"Libxml",
195198
"Lintr",
@@ -522,6 +525,7 @@
522525
"customrules",
523526
"cyclomatic",
524527
"dartanalyzer",
528+
"davidjeddy",
525529
"debugent",
526530
"decamelize",
527531
"dedup",
@@ -678,6 +682,7 @@
678682
"goodcheck",
679683
"goodwithtech",
680684
"gosec",
685+
"gotit",
681686
"govet",
682687
"gridftp",
683688
"grimmjo",
@@ -778,7 +783,6 @@
778783
"kxdddddddoc",
779784
"lacheck",
780785
"langserver",
781-
"Laven",
782786
"leavevmode",
783787
"leveldb",
784788
"levn",
@@ -995,6 +999,7 @@
995999
"pipeverb",
9961000
"pipfile",
9971001
"pipvenv",
1002+
"pjungermann",
9981003
"pkgs",
9991004
"plone",
10001005
"pluggable",

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
88

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

11+
- Core
12+
- Upgrade base docker image from python:3.10.4-alpine3.16 to python:3.11.1-alpine3.17
13+
1114
- Linter versions upgrades
1215
- [golangci-lint](https://golangci-lint.run/) from 1.51.0 to **1.51.1** on 2023-02-06
1316
- [cspell](https://github.com/streetsidesoftware/cspell/tree/master/packages/cspell) from 6.21.0 to **6.22.0** on 2023-02-06

Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ FROM checkmarx/kics:alpine as kics
2727
# Get base image #
2828
##################
2929
# 3.10.5 is not usable until https://github.com/jruere/multiprocessing-logging/issues/56 is fixed
30-
FROM python:3.10.4-alpine3.16
30+
FROM python:3.11.1-alpine3.17
3131

3232
#############################################################################################
3333
## @generated by .automation/build.py using descriptor files, please do not update manually ##
@@ -42,7 +42,7 @@ ARG BICEP_EXE='bicep'
4242
ARG BICEP_URI='https://github.com/Azure/bicep/releases/latest/download/bicep-linux-musl-x64'
4343
ARG BICEP_DIR='/usr/local/bin'
4444
ARG DART_VERSION='2.8.4'
45-
ARG GLIBC_VERSION='2.31-r0'
45+
ARG GLIBC_VERSION='2.34-r0'
4646
ARG PMD_VERSION=6.48.0
4747
ARG PSSA_VERSION='latest'
4848
#ARG__END
@@ -410,7 +410,7 @@ RUN curl --retry 5 --retry-delay 5 -sLO "${ARM_TTK_URI}" \
410410
# dartanalyzer installation
411411
&& wget --tries=50 -q -O /etc/apk/keys/sgerrand.rsa.pub https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub \
412412
&& wget --tries=5 -q https://github.com/sgerrand/alpine-pkg-glibc/releases/download/${GLIBC_VERSION}/glibc-${GLIBC_VERSION}.apk \
413-
&& apk add --no-cache glibc-${GLIBC_VERSION}.apk && rm glibc-${GLIBC_VERSION}.apk \
413+
&& apk add --force-overwrite --no-cache glibc-${GLIBC_VERSION}.apk && rm glibc-${GLIBC_VERSION}.apk \
414414
&& wget --tries=5 https://storage.googleapis.com/dart-archive/channels/stable/release/${DART_VERSION}/sdk/dartsdk-linux-x64-release.zip -O - -q | unzip -q - \
415415
&& chmod +x dart-sdk/bin/dart* \
416416
&& mv dart-sdk/bin/* /usr/bin/ && mv dart-sdk/lib/* /usr/lib/ && mv dart-sdk/include/* /usr/include/ \

flavors/ci_light/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ FROM zricethezav/gitleaks:v8.15.3 as gitleaks
2020
# Get base image #
2121
##################
2222
# 3.10.5 is not usable until https://github.com/jruere/multiprocessing-logging/issues/56 is fixed
23-
FROM python:3.10.4-alpine3.16
23+
FROM python:3.11.1-alpine3.17
2424

2525
#############################################################################################
2626
## @generated by .automation/build.py using descriptor files, please do not update manually ##

flavors/cupcake/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ FROM checkmarx/kics:alpine as kics
2626
# Get base image #
2727
##################
2828
# 3.10.5 is not usable until https://github.com/jruere/multiprocessing-logging/issues/56 is fixed
29-
FROM python:3.10.4-alpine3.16
29+
FROM python:3.11.1-alpine3.17
3030

3131
#############################################################################################
3232
## @generated by .automation/build.py using descriptor files, please do not update manually ##

flavors/documentation/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ FROM zricethezav/gitleaks:v8.15.3 as gitleaks
2222
# Get base image #
2323
##################
2424
# 3.10.5 is not usable until https://github.com/jruere/multiprocessing-logging/issues/56 is fixed
25-
FROM python:3.10.4-alpine3.16
25+
FROM python:3.11.1-alpine3.17
2626

2727
#############################################################################################
2828
## @generated by .automation/build.py using descriptor files, please do not update manually ##

flavors/dotnet/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ FROM zricethezav/gitleaks:v8.15.3 as gitleaks
2222
# Get base image #
2323
##################
2424
# 3.10.5 is not usable until https://github.com/jruere/multiprocessing-logging/issues/56 is fixed
25-
FROM python:3.10.4-alpine3.16
25+
FROM python:3.11.1-alpine3.17
2626

2727
#############################################################################################
2828
## @generated by .automation/build.py using descriptor files, please do not update manually ##

flavors/go/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ FROM zricethezav/gitleaks:v8.15.3 as gitleaks
2222
# Get base image #
2323
##################
2424
# 3.10.5 is not usable until https://github.com/jruere/multiprocessing-logging/issues/56 is fixed
25-
FROM python:3.10.4-alpine3.16
25+
FROM python:3.11.1-alpine3.17
2626

2727
#############################################################################################
2828
## @generated by .automation/build.py using descriptor files, please do not update manually ##

0 commit comments

Comments
 (0)