Skip to content

Commit d9d1909

Browse files
authored
chore: bump alpine image to 3.20 and php to 8.3.x (#5863)
1 parent 587fe0a commit d9d1909

2 files changed

Lines changed: 28 additions & 28 deletions

File tree

‎Dockerfile‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ FROM zricethezav/gitleaks:v8.18.3 AS gitleaks
2828
FROM yoheimuta/protolint:0.50.2 AS protolint
2929
FROM ghcr.io/clj-kondo/clj-kondo:2024.05.24-alpine AS clj-kondo
3030
FROM dart:3.4.2-sdk AS dart
31-
FROM mcr.microsoft.com/dotnet/sdk:8.0.301-alpine3.19 AS dotnet-sdk
31+
FROM mcr.microsoft.com/dotnet/sdk:8.0.302-alpine3.20 AS dotnet-sdk
3232
FROM mcr.microsoft.com/powershell:7.4-alpine-3.17 AS powershell
3333

34-
FROM python:3.12.3-alpine3.19 AS clang-format
34+
FROM python:3.12.3-alpine3.20 AS clang-format
3535

3636
RUN apk add --no-cache \
3737
build-base \
@@ -58,7 +58,7 @@ RUN cmake \
5858
&& ninja clang-format \
5959
&& mv /tmp/llvm-project/llvm/build/bin/clang-format /usr/bin
6060

61-
FROM python:3.12.3-alpine3.19 AS python-builder
61+
FROM python:3.12.3-alpine3.20 AS python-builder
6262

6363
RUN apk add --no-cache \
6464
bash
@@ -69,7 +69,7 @@ COPY dependencies/python/ /stage
6969
WORKDIR /stage
7070
RUN ./build-venvs.sh && rm -rfv /stage
7171

72-
FROM python:3.12.3-alpine3.19 AS npm-builder
72+
FROM python:3.12.3-alpine3.20 AS npm-builder
7373

7474
RUN apk add --no-cache \
7575
bash \
@@ -100,7 +100,7 @@ COPY TEMPLATES/.tflint.hcl /action/lib/.automation/
100100
# Initialize TFLint plugins so we get plugin versions listed when we ask for TFLint version
101101
RUN tflint --init -c /action/lib/.automation/.tflint.hcl
102102

103-
FROM python:3.12.3-alpine3.19 AS lintr-installer
103+
FROM python:3.12.3-alpine3.20 AS lintr-installer
104104

105105
RUN apk add --no-cache \
106106
bash \
@@ -117,7 +117,7 @@ FROM powershell AS powershell-installer
117117
# when copying PowerShell stuff in the main image
118118
RUN echo "${PS_INSTALL_FOLDER}" > /tmp/PS_INSTALL_FOLDER
119119

120-
FROM python:3.12.3-alpine3.19 AS base_image
120+
FROM python:3.12.3-alpine3.20 AS base_image
121121

122122
LABEL com.github.actions.name="Super-Linter" \
123123
com.github.actions.description="Super-linter is a ready-to-run collection of linters and code analyzers, to help validate your source code." \
@@ -158,17 +158,17 @@ RUN apk add --no-cache \
158158
openssh-client \
159159
parallel \
160160
perl \
161-
php82 \
162-
php82-ctype \
163-
php82-curl \
164-
php82-dom \
165-
php82-iconv \
166-
php82-mbstring \
167-
php82-openssl \
168-
php82-phar \
169-
php82-simplexml \
170-
php82-tokenizer \
171-
php82-xmlwriter \
161+
php83 \
162+
php83-ctype \
163+
php83-curl \
164+
php83-dom \
165+
php83-iconv \
166+
php83-mbstring \
167+
php83-openssl \
168+
php83-phar \
169+
php83-simplexml \
170+
php83-tokenizer \
171+
php83-xmlwriter \
172172
R \
173173
rakudo \
174174
ruby \

‎test/inspec/super-linter/controls/super_linter.rb‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -51,17 +51,17 @@
5151
"openssh-client",
5252
"parallel",
5353
"perl",
54-
"php82",
55-
"php82-ctype",
56-
"php82-curl",
57-
"php82-dom",
58-
"php82-iconv",
59-
"php82-mbstring",
60-
"php82-openssl",
61-
"php82-phar",
62-
"php82-simplexml",
63-
"php82-tokenizer",
64-
"php82-xmlwriter",
54+
"php83",
55+
"php83-ctype",
56+
"php83-curl",
57+
"php83-dom",
58+
"php83-iconv",
59+
"php83-mbstring",
60+
"php83-openssl",
61+
"php83-phar",
62+
"php83-simplexml",
63+
"php83-tokenizer",
64+
"php83-xmlwriter",
6565
"R",
6666
"rakudo",
6767
"ruby",

0 commit comments

Comments
 (0)