From 079a9da5c3418fcb11fa78aa3ed77df6c6491d55 Mon Sep 17 00:00:00 2001 From: Chris Martin Date: Tue, 6 Aug 2024 10:15:08 +0100 Subject: [PATCH] Update to alpine:3.20.2 (#3867) Signed-off-by: Chris Martin Co-authored-by: Chris Martin --- .goreleaser.yml | 2 +- build/armada-load-tester/Dockerfile | 2 +- build/armada/Dockerfile | 2 +- build/armadactl/Dockerfile | 2 +- build/binoculars/Dockerfile | 2 +- build/eventingester/Dockerfile | 2 +- build/executor/Dockerfile | 2 +- build/fakeexecutor/Dockerfile | 2 +- build/lookoutingesterv2/Dockerfile | 2 +- build/lookoutv2/Dockerfile | 2 +- build/scheduler/Dockerfile | 2 +- build/scheduleringester/Dockerfile | 2 +- build/testsuite/Dockerfile | 2 +- build_goreleaser/armadactl/Dockerfile | 2 +- build_goreleaser/binoculars/Dockerfile | 2 +- build_goreleaser/bundles/armada/Dockerfile | 2 +- build_goreleaser/bundles/full/Dockerfile | 2 +- build_goreleaser/bundles/lookout/Dockerfile | 2 +- build_goreleaser/eventingester/Dockerfile | 2 +- build_goreleaser/executor/Dockerfile | 2 +- build_goreleaser/fakeexecutor/Dockerfile | 2 +- build_goreleaser/loadtester/Dockerfile | 2 +- build_goreleaser/lookoutingesterv2/Dockerfile | 2 +- build_goreleaser/lookoutv2/Dockerfile | 2 +- build_goreleaser/scheduler/Dockerfile | 2 +- build_goreleaser/scheduleringester/Dockerfile | 2 +- build_goreleaser/server/Dockerfile | 2 +- build_goreleaser/testsuite/Dockerfile | 2 +- cmd/armada-load-tester/cmd/loadtest.go | 2 +- e2e/armadactl_test/armadactl_test.go | 2 +- third_party/airflow/README.md | 2 +- third_party/airflow/test/operators/test_armada.py | 2 +- 32 files changed, 32 insertions(+), 32 deletions(-) diff --git a/.goreleaser.yml b/.goreleaser.yml index a6869530018..a11f4c8fa1a 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -186,7 +186,7 @@ dockers: - --label=org.opencontainers.image.version={{ .Version }} - --label=org.opencontainers.image.created={{ time "2006-01-02T15:04:05Z07:00" }} - --label=org.opencontainers.image.revision={{ .FullCommit }} - - --label=org.opencontainers.image.base.name=alpine:3.20.1 + - --label=org.opencontainers.image.base.name=alpine:3.20.2 - --label=org.opencontainers.image.licenses=Apache-2.0 - --label=org.opencontainers.image.vendor=G-Research ids: diff --git a/build/armada-load-tester/Dockerfile b/build/armada-load-tester/Dockerfile index 9ecee0f7061..d47beb40e7d 100644 --- a/build/armada-load-tester/Dockerfile +++ b/build/armada-load-tester/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.20.1 +FROM alpine:3.20.2 RUN addgroup -S -g 2000 armada && adduser -S -u 1000 armada -G armada diff --git a/build/armada/Dockerfile b/build/armada/Dockerfile index 7d15d88abb1..485f4139a78 100644 --- a/build/armada/Dockerfile +++ b/build/armada/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.20.1 +FROM alpine:3.20.2 RUN addgroup -S -g 2000 armada && adduser -S -u 1000 armada -G armada diff --git a/build/armadactl/Dockerfile b/build/armadactl/Dockerfile index 1c0e5518eab..e8ef1cf826c 100644 --- a/build/armadactl/Dockerfile +++ b/build/armadactl/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.20.1 +FROM alpine:3.20.2 RUN addgroup -S -g 2000 armada && adduser -S -u 1000 armada -G armada diff --git a/build/binoculars/Dockerfile b/build/binoculars/Dockerfile index a2d05ef191e..fbb6ac94635 100644 --- a/build/binoculars/Dockerfile +++ b/build/binoculars/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.20.1 +FROM alpine:3.20.2 RUN addgroup -S -g 2000 armada && adduser -S -u 1000 armada -G armada diff --git a/build/eventingester/Dockerfile b/build/eventingester/Dockerfile index e1c29decfb0..79bc11c369d 100644 --- a/build/eventingester/Dockerfile +++ b/build/eventingester/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.20.1 +FROM alpine:3.20.2 RUN addgroup -S -g 2000 armada && adduser -S -u 1000 armada -G armada diff --git a/build/executor/Dockerfile b/build/executor/Dockerfile index 99dfe76151a..1b4c628f3f9 100644 --- a/build/executor/Dockerfile +++ b/build/executor/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.20.1 +FROM alpine:3.20.2 RUN addgroup -S -g 2000 armada && adduser -S -u 1000 armada -G armada diff --git a/build/fakeexecutor/Dockerfile b/build/fakeexecutor/Dockerfile index 7e92d6b1ec5..dfdb139854e 100644 --- a/build/fakeexecutor/Dockerfile +++ b/build/fakeexecutor/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.20.1 +FROM alpine:3.20.2 RUN addgroup -S -g 2000 armada && adduser -S -u 1000 armada -G armada diff --git a/build/lookoutingesterv2/Dockerfile b/build/lookoutingesterv2/Dockerfile index c2ef341b15d..30b1c4bfbae 100644 --- a/build/lookoutingesterv2/Dockerfile +++ b/build/lookoutingesterv2/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.20.1 +FROM alpine:3.20.2 RUN addgroup -S -g 2000 armada && adduser -S -u 1000 armada -G armada diff --git a/build/lookoutv2/Dockerfile b/build/lookoutv2/Dockerfile index 1a672055b0b..b5a73b1a80e 100644 --- a/build/lookoutv2/Dockerfile +++ b/build/lookoutv2/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.20.1 +FROM alpine:3.20.2 RUN addgroup -S -g 2000 armada && adduser -S -u 1000 armada -G armada diff --git a/build/scheduler/Dockerfile b/build/scheduler/Dockerfile index 28a11f01b8e..af81977ae29 100644 --- a/build/scheduler/Dockerfile +++ b/build/scheduler/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.20.1 +FROM alpine:3.20.2 RUN addgroup -S -g 2000 armada && adduser -S -u 1000 armada -G armada diff --git a/build/scheduleringester/Dockerfile b/build/scheduleringester/Dockerfile index 817dd8d297c..efcce6a4e77 100644 --- a/build/scheduleringester/Dockerfile +++ b/build/scheduleringester/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.20.1 +FROM alpine:3.20.2 RUN addgroup -S -g 2000 armada && adduser -S -u 1000 armada -G armada diff --git a/build/testsuite/Dockerfile b/build/testsuite/Dockerfile index 319eee90738..498726edef6 100644 --- a/build/testsuite/Dockerfile +++ b/build/testsuite/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.20.1 +FROM alpine:3.20.2 RUN addgroup -S -g 2000 armada && adduser -S -u 1000 armada -G armada diff --git a/build_goreleaser/armadactl/Dockerfile b/build_goreleaser/armadactl/Dockerfile index 80d6b6a66df..f6206348fa6 100644 --- a/build_goreleaser/armadactl/Dockerfile +++ b/build_goreleaser/armadactl/Dockerfile @@ -1,4 +1,4 @@ -ARG BASE_IMAGE=alpine:3.20.1 +ARG BASE_IMAGE=alpine:3.20.2 FROM ${BASE_IMAGE} LABEL org.opencontainers.image.title=armadactl diff --git a/build_goreleaser/binoculars/Dockerfile b/build_goreleaser/binoculars/Dockerfile index 67e3c944ff1..58807ae72d4 100644 --- a/build_goreleaser/binoculars/Dockerfile +++ b/build_goreleaser/binoculars/Dockerfile @@ -1,4 +1,4 @@ -ARG BASE_IMAGE=alpine:3.20.1 +ARG BASE_IMAGE=alpine:3.20.2 FROM ${BASE_IMAGE} LABEL org.opencontainers.image.title=binoculars LABEL org.opencontainers.image.description="binoculars" diff --git a/build_goreleaser/bundles/armada/Dockerfile b/build_goreleaser/bundles/armada/Dockerfile index 3403e3b620f..cd910f6a021 100644 --- a/build_goreleaser/bundles/armada/Dockerfile +++ b/build_goreleaser/bundles/armada/Dockerfile @@ -1,4 +1,4 @@ -ARG BASE_IMAGE=alpine:3.20.1 +ARG BASE_IMAGE=alpine:3.20.2 FROM ${BASE_IMAGE} LABEL org.opencontainers.image.title=armada LABEL org.opencontainers.image.description="Armada Bundle" diff --git a/build_goreleaser/bundles/full/Dockerfile b/build_goreleaser/bundles/full/Dockerfile index 920284f849e..96cb170c9bf 100644 --- a/build_goreleaser/bundles/full/Dockerfile +++ b/build_goreleaser/bundles/full/Dockerfile @@ -1,6 +1,6 @@ ARG NODE_BUILD_IMAGE=node:16.14-buster ARG OPENAPI_BUILD_IMAGE=openapitools/openapi-generator-cli:v5.4.0 -ARG BASE_IMAGE=alpine:3.20.1 +ARG BASE_IMAGE=alpine:3.20.2 FROM ${OPENAPI_BUILD_IMAGE} AS OPENAPI LABEL org.opencontainers.image.title=armada-full-bundle diff --git a/build_goreleaser/bundles/lookout/Dockerfile b/build_goreleaser/bundles/lookout/Dockerfile index ac1e173ca95..4d194524c81 100644 --- a/build_goreleaser/bundles/lookout/Dockerfile +++ b/build_goreleaser/bundles/lookout/Dockerfile @@ -1,4 +1,4 @@ -ARG BASE_IMAGE=alpine:3.20.1 +ARG BASE_IMAGE=alpine:3.20.2 FROM ${BASE_IMAGE} LABEL org.opencontainers.image.title=armada-lookout-bundle diff --git a/build_goreleaser/eventingester/Dockerfile b/build_goreleaser/eventingester/Dockerfile index 70431bb3967..3a59ff815b3 100644 --- a/build_goreleaser/eventingester/Dockerfile +++ b/build_goreleaser/eventingester/Dockerfile @@ -1,4 +1,4 @@ -ARG BASE_IMAGE=alpine:3.20.1 +ARG BASE_IMAGE=alpine:3.20.2 FROM ${BASE_IMAGE} LABEL org.opencontainers.image.title=eventingester diff --git a/build_goreleaser/executor/Dockerfile b/build_goreleaser/executor/Dockerfile index 0b627d7f2ce..275a32a8dd3 100644 --- a/build_goreleaser/executor/Dockerfile +++ b/build_goreleaser/executor/Dockerfile @@ -1,4 +1,4 @@ -ARG BASE_IMAGE=alpine:3.20.1 +ARG BASE_IMAGE=alpine:3.20.2 FROM ${BASE_IMAGE} LABEL org.opencontainers.image.title=executor diff --git a/build_goreleaser/fakeexecutor/Dockerfile b/build_goreleaser/fakeexecutor/Dockerfile index 444cdc5afb0..e55b4e05ba8 100644 --- a/build_goreleaser/fakeexecutor/Dockerfile +++ b/build_goreleaser/fakeexecutor/Dockerfile @@ -1,4 +1,4 @@ -ARG BASE_IMAGE=alpine:3.20.1 +ARG BASE_IMAGE=alpine:3.20.2 FROM ${BASE_IMAGE} LABEL org.opencontainers.image.title=fakeexecutor LABEL org.opencontainers.image.description="Fake Executor" diff --git a/build_goreleaser/loadtester/Dockerfile b/build_goreleaser/loadtester/Dockerfile index 5ecb9156aa7..bb8c9c9d9fc 100644 --- a/build_goreleaser/loadtester/Dockerfile +++ b/build_goreleaser/loadtester/Dockerfile @@ -1,4 +1,4 @@ -ARG BASE_IMAGE=alpine:3.20.1 +ARG BASE_IMAGE=alpine:3.20.2 FROM ${BASE_IMAGE} LABEL org.opencontainers.image.title=loadtester diff --git a/build_goreleaser/lookoutingesterv2/Dockerfile b/build_goreleaser/lookoutingesterv2/Dockerfile index 25595221e68..fe8be0fefb7 100644 --- a/build_goreleaser/lookoutingesterv2/Dockerfile +++ b/build_goreleaser/lookoutingesterv2/Dockerfile @@ -1,4 +1,4 @@ -ARG BASE_IMAGE=alpine:3.20.1 +ARG BASE_IMAGE=alpine:3.20.2 FROM ${BASE_IMAGE} LABEL org.opencontainers.image.title=lookoutingesterv2 diff --git a/build_goreleaser/lookoutv2/Dockerfile b/build_goreleaser/lookoutv2/Dockerfile index 7d0e1ebca53..891315aa549 100644 --- a/build_goreleaser/lookoutv2/Dockerfile +++ b/build_goreleaser/lookoutv2/Dockerfile @@ -1,6 +1,6 @@ ARG NODE_BUILD_IMAGE=node:16.14-buster ARG OPENAPI_BUILD_IMAGE=openapitools/openapi-generator-cli:v5.4.0 -ARG BASE_IMAGE=alpine:3.20.1 +ARG BASE_IMAGE=alpine:3.20.2 FROM ${OPENAPI_BUILD_IMAGE} AS OPENAPI diff --git a/build_goreleaser/scheduler/Dockerfile b/build_goreleaser/scheduler/Dockerfile index 24de8d5b69e..43796447fb5 100644 --- a/build_goreleaser/scheduler/Dockerfile +++ b/build_goreleaser/scheduler/Dockerfile @@ -1,4 +1,4 @@ -ARG BASE_IMAGE=alpine:3.20.1 +ARG BASE_IMAGE=alpine:3.20.2 FROM ${BASE_IMAGE} LABEL org.opencontainers.image.title=scheduler diff --git a/build_goreleaser/scheduleringester/Dockerfile b/build_goreleaser/scheduleringester/Dockerfile index 1d5096fc9ef..ee9e3fa2bff 100644 --- a/build_goreleaser/scheduleringester/Dockerfile +++ b/build_goreleaser/scheduleringester/Dockerfile @@ -1,4 +1,4 @@ -ARG BASE_IMAGE=alpine:3.20.1 +ARG BASE_IMAGE=alpine:3.20.2 FROM ${BASE_IMAGE} LABEL org.opencontainers.image.title=scheduleringester diff --git a/build_goreleaser/server/Dockerfile b/build_goreleaser/server/Dockerfile index 614ef8591e9..85103dae78e 100644 --- a/build_goreleaser/server/Dockerfile +++ b/build_goreleaser/server/Dockerfile @@ -1,4 +1,4 @@ -ARG BASE_IMAGE=alpine:3.20.1 +ARG BASE_IMAGE=alpine:3.20.2 FROM ${BASE_IMAGE} LABEL org.opencontainers.image.title=armada-server diff --git a/build_goreleaser/testsuite/Dockerfile b/build_goreleaser/testsuite/Dockerfile index c8dfccf4a95..9571bd56220 100644 --- a/build_goreleaser/testsuite/Dockerfile +++ b/build_goreleaser/testsuite/Dockerfile @@ -1,4 +1,4 @@ -ARG BASE_IMAGE=alpine:3.20.1 +ARG BASE_IMAGE=alpine:3.20.2 FROM ${BASE_IMAGE} LABEL org.opencontainers.image.title=testsuite LABEL org.opencontainers.image.description="Test Suite" diff --git a/cmd/armada-load-tester/cmd/loadtest.go b/cmd/armada-load-tester/cmd/loadtest.go index ad5a47eea85..689728c5d06 100644 --- a/cmd/armada-load-tester/cmd/loadtest.go +++ b/cmd/armada-load-tester/cmd/loadtest.go @@ -52,7 +52,7 @@ var loadtestCmd = &cobra.Command{ containers: - name: sleep imagePullPolicy: IfNotPresent - image: alpine:3.20.1 + image: alpine:3.20.2 command: - sh args: diff --git a/e2e/armadactl_test/armadactl_test.go b/e2e/armadactl_test/armadactl_test.go index 419b4eaa114..6acc8a91dbc 100644 --- a/e2e/armadactl_test/armadactl_test.go +++ b/e2e/armadactl_test/armadactl_test.go @@ -175,7 +175,7 @@ jobs: containers: - name: ls imagePullPolicy: IfNotPresent - image: alpine:3.20.1 + image: alpine:3.20.2 command: - sh - -c diff --git a/third_party/airflow/README.md b/third_party/airflow/README.md index 4a2425d569e..d15bec7e374 100644 --- a/third_party/airflow/README.md +++ b/third_party/airflow/README.md @@ -39,7 +39,7 @@ def create_dummy_job(): containers=[ core_v1.Container( name="sleep", - image="alpine:3.20.1", + image="alpine:3.20.2", args=["sh", "-c", "for i in $(seq 1 60); do echo $i; sleep 1; done"], securityContext=core_v1.SecurityContext(runAsUser=1000), resources=core_v1.ResourceRequirements( diff --git a/third_party/airflow/test/operators/test_armada.py b/third_party/airflow/test/operators/test_armada.py index 1f134ce3411..90f6448defa 100644 --- a/third_party/airflow/test/operators/test_armada.py +++ b/third_party/airflow/test/operators/test_armada.py @@ -274,7 +274,7 @@ def test_templating(self): containers=[ core_v1.Container( name="sleep", - image="alpine:3.20.1", + image="alpine:3.20.2", args=[pod_arg], securityContext=core_v1.SecurityContext(runAsUser=1000), resources=core_v1.ResourceRequirements(