Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Images: Use latest Alpine 3.20 everywhere. #11945

Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Images: Use latest Alpine 3.20 everywhere.
Gacko authored and k8s-infra-cherrypick-robot committed Sep 7, 2024
commit f06de2c633e7da8decac34ae98c972f0c1fc8d9e
2 changes: 1 addition & 1 deletion docs/examples/customization/sysctl/patch.json
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@
"spec": {
"initContainers": [{
"name": "sysctl",
"image": "alpine:3.18",
"image": "alpine:3.20",
"securityContext": {
"privileged": true
},
4 changes: 2 additions & 2 deletions images/cfssl/rootfs/Dockerfile
Original file line number Diff line number Diff line change
@@ -12,9 +12,9 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM alpine:3.20.0
FROM alpine:3.20

RUN echo "@testing http://nl.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 \
&& apk upgrade && \
apk add --no-cache \
4 changes: 2 additions & 2 deletions images/nginx-1.25/rootfs/Dockerfile
Original file line number Diff line number Diff line change
@@ -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.20.0 as builder
FROM alpine:3.20 as builder

COPY . /

@@ -21,7 +21,7 @@ RUN apk update \
&& /build.sh

# Use a multi-stage build
FROM alpine:3.20.0
FROM alpine:3.20

ENV PATH=$PATH:/usr/local/luajit/bin:/usr/local/nginx/sbin:/usr/local/nginx/bin

4 changes: 2 additions & 2 deletions images/nginx/rootfs/Dockerfile
Original file line number Diff line number Diff line change
@@ -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.20.0 as builder
FROM alpine:3.20 as builder

COPY . /

@@ -21,7 +21,7 @@ RUN apk update \
&& /build.sh

# Use a multi-stage build
FROM alpine:3.20.0
FROM alpine:3.20

ENV PATH=$PATH:/usr/local/luajit/bin:/usr/local/nginx/sbin:/usr/local/nginx/bin

2 changes: 1 addition & 1 deletion images/opentelemetry/rootfs/Dockerfile
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@
# limitations under the License.


FROM alpine:3.20.0 AS base
FROM alpine:3.20 AS base

RUN mkdir -p /opt/third_party/install
COPY . /opt/third_party/
2 changes: 1 addition & 1 deletion images/test-runner/rootfs/Dockerfile
Original file line number Diff line number Diff line change
@@ -48,7 +48,7 @@ RUN mkdir -p "$GOPATH/src" "$GOPATH/bin" && chmod -R 777 "$GOPATH"

COPY --from=etcd /usr/local/bin/etcd /usr/local/bin/etcd

RUN echo "@testing https://nl.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 && apk upgrade && apk add --no-cache \
bash \
2 changes: 1 addition & 1 deletion rootfs/Dockerfile-chroot
Original file line number Diff line number Diff line change
@@ -23,7 +23,7 @@ RUN apk update \
&& apk upgrade \
&& /chroot.sh

FROM alpine:3.20.0
FROM alpine:3.20

ARG TARGETARCH
ARG VERSION
2 changes: 1 addition & 1 deletion test/e2e-image/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ARG E2E_BASE_IMAGE
FROM ${E2E_BASE_IMAGE} AS BASE

FROM alpine:3.20.0
FROM alpine:3.20

RUN apk update \
&& apk upgrade && apk add -U --no-cache \