From 9a60a7aceb2692d0064bd8d29c9d3bebbba63789 Mon Sep 17 00:00:00 2001 From: Chris Martin Date: Tue, 10 Sep 2024 15:34:13 +0100 Subject: [PATCH] Update alpine from 3.20.2 to 3.20.3 (#3945) * Update alpine from 3.20.2 to 3.20.3 Signed-off-by: Chris Martin * fix merge conflicts Signed-off-by: Chris Martin --------- Signed-off-by: Chris Martin --- .goreleaser.yml | 2 +- build/armada-load-tester/Dockerfile | 2 +- build/armadactl/Dockerfile | 2 +- build/binoculars/Dockerfile | 2 +- build/bundles/armada/Dockerfile | 2 +- build/bundles/full/Dockerfile | 2 +- build/bundles/lookout/Dockerfile | 2 +- build/eventingester/Dockerfile | 2 +- build/executor/Dockerfile | 2 +- build/fakeexecutor/Dockerfile | 2 +- build/loadtester/Dockerfile | 2 +- build/lookoutingesterv2/Dockerfile | 2 +- build/lookoutv2/Dockerfile | 2 +- build/scheduler/Dockerfile | 2 +- build/scheduleringester/Dockerfile | 2 +- build/server/Dockerfile | 2 +- build/testsuite/Dockerfile | 2 +- cmd/armada-load-tester/cmd/loadtest.go | 2 +- e2e/armadactl_test/armadactl_test.go | 2 +- third_party/airflow/README.md | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-) diff --git a/.goreleaser.yml b/.goreleaser.yml index aca21d51163..c94b4bf8433 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.2 + - --label=org.opencontainers.image.base.name=alpine:3.20.3 - --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 d47beb40e7d..7d18149b427 100644 --- a/build/armada-load-tester/Dockerfile +++ b/build/armada-load-tester/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.20.2 +FROM alpine:3.20.3 RUN addgroup -S -g 2000 armada && adduser -S -u 1000 armada -G armada diff --git a/build/armadactl/Dockerfile b/build/armadactl/Dockerfile index cb311def91c..1ca42d48402 100644 --- a/build/armadactl/Dockerfile +++ b/build/armadactl/Dockerfile @@ -1,4 +1,4 @@ -ARG BASE_IMAGE=alpine:3.20.2 +ARG BASE_IMAGE=alpine:3.20.3 FROM ${BASE_IMAGE} LABEL org.opencontainers.image.title=armadactl diff --git a/build/binoculars/Dockerfile b/build/binoculars/Dockerfile index daa192ca565..44dd4e15b7c 100644 --- a/build/binoculars/Dockerfile +++ b/build/binoculars/Dockerfile @@ -1,4 +1,4 @@ -ARG BASE_IMAGE=alpine:3.20.2 +ARG BASE_IMAGE=alpine:3.20.3 FROM ${BASE_IMAGE} LABEL org.opencontainers.image.title=binoculars LABEL org.opencontainers.image.description="binoculars" diff --git a/build/bundles/armada/Dockerfile b/build/bundles/armada/Dockerfile index 559451c184b..badf04f0c73 100644 --- a/build/bundles/armada/Dockerfile +++ b/build/bundles/armada/Dockerfile @@ -1,4 +1,4 @@ -ARG BASE_IMAGE=alpine:3.20.2 +ARG BASE_IMAGE=alpine:3.20.3 FROM ${BASE_IMAGE} LABEL org.opencontainers.image.title=armada LABEL org.opencontainers.image.description="Armada Bundle" diff --git a/build/bundles/full/Dockerfile b/build/bundles/full/Dockerfile index 5d638659de0..cc4d7c40897 100644 --- a/build/bundles/full/Dockerfile +++ b/build/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.2 +ARG BASE_IMAGE=alpine:3.20.3 FROM ${OPENAPI_BUILD_IMAGE} AS OPENAPI LABEL org.opencontainers.image.title=armada-full-bundle diff --git a/build/bundles/lookout/Dockerfile b/build/bundles/lookout/Dockerfile index e4695696c14..cde952af59f 100644 --- a/build/bundles/lookout/Dockerfile +++ b/build/bundles/lookout/Dockerfile @@ -1,4 +1,4 @@ -ARG BASE_IMAGE=alpine:3.20.2 +ARG BASE_IMAGE=alpine:3.20.3 FROM ${BASE_IMAGE} LABEL org.opencontainers.image.title=armada-lookout-bundle diff --git a/build/eventingester/Dockerfile b/build/eventingester/Dockerfile index f17a0556d24..395792b0013 100644 --- a/build/eventingester/Dockerfile +++ b/build/eventingester/Dockerfile @@ -1,4 +1,4 @@ -ARG BASE_IMAGE=alpine:3.20.2 +ARG BASE_IMAGE=alpine:3.20.3 FROM ${BASE_IMAGE} LABEL org.opencontainers.image.title=eventingester diff --git a/build/executor/Dockerfile b/build/executor/Dockerfile index ef3cacccfc8..083a7141999 100644 --- a/build/executor/Dockerfile +++ b/build/executor/Dockerfile @@ -1,4 +1,4 @@ -ARG BASE_IMAGE=alpine:3.20.2 +ARG BASE_IMAGE=alpine:3.20.3 FROM ${BASE_IMAGE} LABEL org.opencontainers.image.title=executor diff --git a/build/fakeexecutor/Dockerfile b/build/fakeexecutor/Dockerfile index e55b4e05ba8..bae8be1cb75 100644 --- a/build/fakeexecutor/Dockerfile +++ b/build/fakeexecutor/Dockerfile @@ -1,4 +1,4 @@ -ARG BASE_IMAGE=alpine:3.20.2 +ARG BASE_IMAGE=alpine:3.20.3 FROM ${BASE_IMAGE} LABEL org.opencontainers.image.title=fakeexecutor LABEL org.opencontainers.image.description="Fake Executor" diff --git a/build/loadtester/Dockerfile b/build/loadtester/Dockerfile index bb8c9c9d9fc..543c14617a1 100644 --- a/build/loadtester/Dockerfile +++ b/build/loadtester/Dockerfile @@ -1,4 +1,4 @@ -ARG BASE_IMAGE=alpine:3.20.2 +ARG BASE_IMAGE=alpine:3.20.3 FROM ${BASE_IMAGE} LABEL org.opencontainers.image.title=loadtester diff --git a/build/lookoutingesterv2/Dockerfile b/build/lookoutingesterv2/Dockerfile index 5c8104a1b17..5c7ff56235c 100644 --- a/build/lookoutingesterv2/Dockerfile +++ b/build/lookoutingesterv2/Dockerfile @@ -1,4 +1,4 @@ -ARG BASE_IMAGE=alpine:3.20.2 +ARG BASE_IMAGE=alpine:3.20.3 FROM ${BASE_IMAGE} LABEL org.opencontainers.image.title=lookoutingesterv2 diff --git a/build/lookoutv2/Dockerfile b/build/lookoutv2/Dockerfile index 6ba72bb7629..aca696ede5f 100644 --- a/build/lookoutv2/Dockerfile +++ b/build/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.2 +ARG BASE_IMAGE=alpine:3.20.3 FROM ${OPENAPI_BUILD_IMAGE} AS OPENAPI diff --git a/build/scheduler/Dockerfile b/build/scheduler/Dockerfile index 6c84fb53fb3..982bdc07af3 100644 --- a/build/scheduler/Dockerfile +++ b/build/scheduler/Dockerfile @@ -1,4 +1,4 @@ -ARG BASE_IMAGE=alpine:3.20.2 +ARG BASE_IMAGE=alpine:3.20.3 FROM ${BASE_IMAGE} LABEL org.opencontainers.image.title=scheduler diff --git a/build/scheduleringester/Dockerfile b/build/scheduleringester/Dockerfile index 75adac040e8..9ce05f525ec 100644 --- a/build/scheduleringester/Dockerfile +++ b/build/scheduleringester/Dockerfile @@ -1,4 +1,4 @@ -ARG BASE_IMAGE=alpine:3.20.2 +ARG BASE_IMAGE=alpine:3.20.3 FROM ${BASE_IMAGE} LABEL org.opencontainers.image.title=scheduleringester diff --git a/build/server/Dockerfile b/build/server/Dockerfile index 1effc7b8d77..81d6031fe64 100644 --- a/build/server/Dockerfile +++ b/build/server/Dockerfile @@ -1,4 +1,4 @@ -ARG BASE_IMAGE=alpine:3.20.2 +ARG BASE_IMAGE=alpine:3.20.3 FROM ${BASE_IMAGE} LABEL org.opencontainers.image.title=armada-server diff --git a/build/testsuite/Dockerfile b/build/testsuite/Dockerfile index 2951011ae6a..bfd2ecce2cd 100644 --- a/build/testsuite/Dockerfile +++ b/build/testsuite/Dockerfile @@ -1,4 +1,4 @@ -ARG BASE_IMAGE=alpine:3.20.2 +ARG BASE_IMAGE=alpine:3.20.3 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 689728c5d06..a5805c73905 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.2 + image: alpine:3.20.3 command: - sh args: diff --git a/e2e/armadactl_test/armadactl_test.go b/e2e/armadactl_test/armadactl_test.go index 6acc8a91dbc..a44a01f9a28 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.2 + image: alpine:3.20.3 command: - sh - -c diff --git a/third_party/airflow/README.md b/third_party/airflow/README.md index d15bec7e374..310695a6260 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.2", + image="alpine:3.20.3", 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(