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 <[email protected]> * fix merge conflicts Signed-off-by: Chris Martin <[email protected]> --------- Signed-off-by: Chris Martin <[email protected]>
armadaproject · Sep 10, 2024 · 9a60a7a · 9a60a7a
1 parent 8679c97
commit 9a60a7a
Show file tree

Hide file tree

Showing 20 changed files with 20 additions and 20 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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(