DevFW-CICD/ingress-nginx-helm
16
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Images: Bump Alpine to v3.21.

Browse source
This commit is contained in:
dependabot[bot] 2024-12-09 11:17:07 +00:00 committed by Marco Ebert
parent 94e39e32cf
commit f51c14b290
11 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
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.20 USE_SHELL=/bin/sh build/run-in-docker.sh \ E2E_IMAGE=golang:$(GO_VERSION)-alpine3.21 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) \

2
docs/examples/customization/sysctl/patch.json
View file

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

2
images/cfssl/rootfs/Dockerfile
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.20 FROM alpine:3.21
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 \

2
images/custom-error-pages/rootfs/Dockerfile
View file

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

2
images/ext-auth-example-authsvc/rootfs/Dockerfile
View file

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

2
images/fastcgi-helloserver/rootfs/Dockerfile
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.20 as builder FROM golang:${GOLANG_VERSION}-alpine3.21 as builder
WORKDIR /go/src/k8s.io/ingress-nginx/images/fastcgi WORKDIR /go/src/k8s.io/ingress-nginx/images/fastcgi

2
images/go-grpc-greeter-server/rootfs/Dockerfile
View file

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

4
images/nginx/rootfs/Dockerfile
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.20 as builder FROM alpine:3.21 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.20 FROM alpine:3.21
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

2
images/test-runner/rootfs/Dockerfile
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.20 as GO FROM golang:${GOLANG_VERSION}-alpine3.21 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}

2
rootfs/Dockerfile-chroot
View file

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

2
test/e2e-image/Dockerfile
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.20 FROM alpine:3.21
RUN apk update \ RUN apk update \
&& apk upgrade && apk add -U --no-cache \ && apk upgrade && apk add -U --no-cache \