Images: Bump Alpine to v3.22. (#13490)

This commit is contained in:
Marco Ebert 2025-06-08 18:10:22 +02:00 committed by GitHub
parent 2363343c7a
commit 44329a804e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
12 changed files with 13 additions and 13 deletions

View File

@ -110,7 +110,7 @@ clean-chroot-image: ## Removes local image
.PHONY: build .PHONY: build
build: ## Build ingress controller, debug tool and pre-stop hook. build: ## Build ingress controller, debug tool and pre-stop hook.
E2E_IMAGE=golang:$(GO_VERSION)-alpine3.21 USE_SHELL=/bin/sh build/run-in-docker.sh \ E2E_IMAGE=golang:$(GO_VERSION)-alpine3.22 USE_SHELL=/bin/sh build/run-in-docker.sh \
MAC_OS=$(MAC_OS) \ MAC_OS=$(MAC_OS) \
PKG=$(PKG) \ PKG=$(PKG) \
ARCH=$(ARCH) \ ARCH=$(ARCH) \

View File

@ -4,7 +4,7 @@
"spec": { "spec": {
"initContainers": [{ "initContainers": [{
"name": "sysctl", "name": "sysctl",
"image": "alpine:3.21", "image": "alpine:3.22",
"securityContext": { "securityContext": {
"privileged": true "privileged": true
}, },

View File

@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
FROM alpine:3.21 FROM alpine:3.22
RUN echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories RUN echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories
RUN apk update \ RUN apk update \

View File

@ -14,7 +14,7 @@
ARG GOLANG_VERSION ARG GOLANG_VERSION
FROM golang:${GOLANG_VERSION}-alpine3.21 AS builder FROM golang:${GOLANG_VERSION}-alpine3.22 AS builder
RUN apk update \ RUN apk update \
&& apk upgrade && apk add git && apk upgrade && apk add git

View File

@ -1,6 +1,6 @@
ARG GOLANG_VERSION ARG GOLANG_VERSION
FROM golang:${GOLANG_VERSION}-alpine3.21 AS builder FROM golang:${GOLANG_VERSION}-alpine3.22 AS builder
RUN mkdir /authsvc RUN mkdir /authsvc
WORKDIR /authsvc WORKDIR /authsvc
COPY . ./ COPY . ./

View File

@ -13,7 +13,7 @@
# limitations under the License. # limitations under the License.
ARG GOLANG_VERSION ARG GOLANG_VERSION
FROM golang:${GOLANG_VERSION}-alpine3.21 AS builder FROM golang:${GOLANG_VERSION}-alpine3.22 AS builder
WORKDIR /go/src/k8s.io/ingress-nginx/images/fastcgi WORKDIR /go/src/k8s.io/ingress-nginx/images/fastcgi

View File

@ -1,6 +1,6 @@
ARG GOLANG_VERSION ARG GOLANG_VERSION
FROM golang:${GOLANG_VERSION}-alpine3.21 AS build FROM golang:${GOLANG_VERSION}-alpine3.22 AS build
WORKDIR /go/src/greeter-server WORKDIR /go/src/greeter-server

View File

@ -11,7 +11,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
FROM alpine:3.21 AS builder FROM alpine:3.22 AS builder
COPY . / COPY . /
@ -21,7 +21,7 @@ RUN apk update \
&& /build.sh && /build.sh
# Use a multi-stage build # Use a multi-stage build
FROM alpine:3.21 FROM alpine:3.22
ENV PATH=$PATH:/usr/local/luajit/bin:/usr/local/nginx/sbin:/usr/local/nginx/bin ENV PATH=$PATH:/usr/local/luajit/bin:/usr/local/nginx/sbin:/usr/local/nginx/bin

View File

@ -413,7 +413,7 @@ Include /etc/nginx/owasp-modsecurity-crs/rules/RESPONSE-999-EXCLUSION-RULES-AFTE
# NGINX compiles a small test program to check if an added module works as expected. # NGINX compiles a small test program to check if an added module works as expected.
# #
# ModSecurity-nginx provides 'printf("hello");' as a test, but newer versions of GCC, # ModSecurity-nginx provides 'printf("hello");' as a test, but newer versions of GCC,
# as included in Alpine 3.21, do not allow implicit declaration of function 'printf': # as included in Alpine 3.22, do not allow implicit declaration of function 'printf':
# #
# objs/autotest.c:7:5: error: implicit declaration of function 'printf' [-Wimplicit-function-declaration] # objs/autotest.c:7:5: error: implicit declaration of function 'printf' [-Wimplicit-function-declaration]
# #

View File

@ -15,7 +15,7 @@ ARG BASE_IMAGE
ARG GOLANG_VERSION ARG GOLANG_VERSION
ARG ETCD_VERSION ARG ETCD_VERSION
FROM golang:${GOLANG_VERSION}-alpine3.21 AS go FROM golang:${GOLANG_VERSION}-alpine3.22 AS go
FROM registry.k8s.io/etcd:${ETCD_VERSION} AS etcd FROM registry.k8s.io/etcd:${ETCD_VERSION} AS etcd
FROM ${BASE_IMAGE} FROM ${BASE_IMAGE}

View File

@ -23,7 +23,7 @@ RUN apk update \
&& apk upgrade \ && apk upgrade \
&& /chroot.sh && /chroot.sh
FROM alpine:3.21 FROM alpine:3.22
ARG TARGETARCH ARG TARGETARCH
ARG VERSION ARG VERSION

View File

@ -1,7 +1,7 @@
ARG E2E_BASE_IMAGE ARG E2E_BASE_IMAGE
FROM ${E2E_BASE_IMAGE} AS BASE FROM ${E2E_BASE_IMAGE} AS BASE
FROM alpine:3.21 FROM alpine:3.22
RUN apk update \ RUN apk update \
&& apk upgrade && apk add -U --no-cache \ && apk upgrade && apk add -U --no-cache \