Images: Bump Alpine to v3.22. (#13490)
This commit is contained in:
parent
2363343c7a
commit
44329a804e
2
Makefile
2
Makefile
|
|
@ -110,7 +110,7 @@ clean-chroot-image: ## Removes local image
|
|||
|
||||
.PHONY: build
|
||||
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) \
|
||||
PKG=$(PKG) \
|
||||
ARCH=$(ARCH) \
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
"spec": {
|
||||
"initContainers": [{
|
||||
"name": "sysctl",
|
||||
"image": "alpine:3.21",
|
||||
"image": "alpine:3.22",
|
||||
"securityContext": {
|
||||
"privileged": true
|
||||
},
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
# See the License for the specific language governing permissions and
|
||||
# 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 apk update \
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
|
||||
ARG GOLANG_VERSION
|
||||
|
||||
FROM golang:${GOLANG_VERSION}-alpine3.21 AS builder
|
||||
FROM golang:${GOLANG_VERSION}-alpine3.22 AS builder
|
||||
|
||||
RUN apk update \
|
||||
&& apk upgrade && apk add git
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
ARG GOLANG_VERSION
|
||||
|
||||
FROM golang:${GOLANG_VERSION}-alpine3.21 AS builder
|
||||
FROM golang:${GOLANG_VERSION}-alpine3.22 AS builder
|
||||
RUN mkdir /authsvc
|
||||
WORKDIR /authsvc
|
||||
COPY . ./
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
# limitations under the License.
|
||||
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
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
ARG GOLANG_VERSION
|
||||
|
||||
FROM golang:${GOLANG_VERSION}-alpine3.21 AS build
|
||||
FROM golang:${GOLANG_VERSION}-alpine3.22 AS build
|
||||
|
||||
WORKDIR /go/src/greeter-server
|
||||
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
FROM alpine:3.21 AS builder
|
||||
FROM alpine:3.22 AS builder
|
||||
|
||||
COPY . /
|
||||
|
||||
|
|
@ -21,7 +21,7 @@ RUN apk update \
|
|||
&& /build.sh
|
||||
|
||||
# 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
|
||||
|
||||
|
|
|
|||
|
|
@ -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.
|
||||
#
|
||||
# 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]
|
||||
#
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ ARG BASE_IMAGE
|
|||
ARG GOLANG_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 ${BASE_IMAGE}
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ RUN apk update \
|
|||
&& apk upgrade \
|
||||
&& /chroot.sh
|
||||
|
||||
FROM alpine:3.21
|
||||
FROM alpine:3.22
|
||||
|
||||
ARG TARGETARCH
|
||||
ARG VERSION
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
ARG E2E_BASE_IMAGE
|
||||
FROM ${E2E_BASE_IMAGE} AS BASE
|
||||
|
||||
FROM alpine:3.21
|
||||
FROM alpine:3.22
|
||||
|
||||
RUN apk update \
|
||||
&& apk upgrade && apk add -U --no-cache \
|
||||
|
|
|
|||
Loading…
Reference in New Issue