alpine to alpine 3.18.2

armadaproject · Jul 25, 2023 · 308cf03 · 308cf03
1 parent a0fad29
commit 308cf03
Show file tree

Hide file tree

Showing 42 changed files with 67 additions and 68 deletions.
diff --git a/.goreleaser.yml b/.goreleaser.yml
@@ -32,7 +32,7 @@ builds:
     id: server
     binary: server
     main: ./cmd/armada/main.go
-    mod_timestamp: '{{ .CommitTimestamp }}'
+    mod_timestamp: "{{ .CommitTimestamp }}"
     goos:
       - linux
     goarch:
@@ -41,7 +41,7 @@ builds:
     id: executor
     binary: executor
     main: ./cmd/executor/main.go
-    mod_timestamp: '{{ .CommitTimestamp }}'
+    mod_timestamp: "{{ .CommitTimestamp }}"
     goos:
       - linux
     goarch:
@@ -50,7 +50,7 @@ builds:
     id: binoculars
     binary: binoculars
     main: ./cmd/binoculars/main.go
-    mod_timestamp: '{{ .CommitTimestamp }}'
+    mod_timestamp: "{{ .CommitTimestamp }}"
     goos:
       - linux
     goarch:
@@ -59,7 +59,7 @@ builds:
     id: lookout
     binary: lookout
     main: ./cmd/lookout/main.go
-    mod_timestamp: '{{ .CommitTimestamp }}'
+    mod_timestamp: "{{ .CommitTimestamp }}"
     goos:
       - linux
     goarch:
@@ -68,7 +68,7 @@ builds:
     id: lookoutv2
     binary: lookoutv2
     main: ./cmd/lookoutv2/main.go
-    mod_timestamp: '{{ .CommitTimestamp }}'
+    mod_timestamp: "{{ .CommitTimestamp }}"
     goos:
       - linux
     goarch:
@@ -77,7 +77,7 @@ builds:
     id: lookoutingester
     binary: lookoutingester
     main: ./cmd/lookoutingester/main.go
-    mod_timestamp: '{{ .CommitTimestamp }}'
+    mod_timestamp: "{{ .CommitTimestamp }}"
     goos:
       - linux
     goarch:
@@ -86,7 +86,7 @@ builds:
     id: lookoutingesterv2
     binary: lookoutingesterv2
     main: ./cmd/lookoutingesterv2/main.go
-    mod_timestamp: '{{ .CommitTimestamp }}'
+    mod_timestamp: "{{ .CommitTimestamp }}"
     goos:
       - linux
     goarch:
@@ -95,7 +95,7 @@ builds:
     id: eventingester
     binary: eventingester
     main: ./cmd/eventingester/main.go
-    mod_timestamp: '{{ .CommitTimestamp }}'
+    mod_timestamp: "{{ .CommitTimestamp }}"
     goos:
       - linux
     goarch:
@@ -104,7 +104,7 @@ builds:
     id: scheduler
     binary: scheduler
     main: ./cmd/scheduler/main.go
-    mod_timestamp: '{{ .CommitTimestamp }}'
+    mod_timestamp: "{{ .CommitTimestamp }}"
     goos:
       - linux
     goarch:
@@ -113,7 +113,7 @@ builds:
     id: scheduleringester
     binary: scheduleringester
     main: ./cmd/scheduleringester/main.go
-    mod_timestamp: '{{ .CommitTimestamp }}'
+    mod_timestamp: "{{ .CommitTimestamp }}"
     goos:
       - linux
     goarch:
@@ -122,7 +122,7 @@ builds:
     id: jobservice
     binary: jobservice
     main: ./cmd/jobservice/main.go
-    mod_timestamp: '{{ .CommitTimestamp }}'
+    mod_timestamp: "{{ .CommitTimestamp }}"
     goos:
       - linux
     goarch:
@@ -131,7 +131,7 @@ builds:
     id: fakeexecutor
     binary: fakeexecutor
     main: ./cmd/fakeexecutor/main.go
-    mod_timestamp: '{{ .CommitTimestamp }}'
+    mod_timestamp: "{{ .CommitTimestamp }}"
     goos:
       - linux
     goarch:
@@ -140,7 +140,7 @@ builds:
     id: armadactl
     binary: armadactl
     main: ./cmd/armadactl/main.go
-    mod_timestamp: '{{ .CommitTimestamp }}'
+    mod_timestamp: "{{ .CommitTimestamp }}"
     goos:
       - windows
       - darwin
@@ -170,7 +170,7 @@ archives:
 universal_binaries:
   - replace: true
     id: armadactl
-    name_template: 'armadactl'
+    name_template: "armadactl"
 
 sboms:
   - artifacts: archive
@@ -196,7 +196,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.17.0
+      - --label=org.opencontainers.image.base.name=alpine:3.18.2.0
       - --label=org.opencontainers.image.base.digest=c0d488a800e4
       - --label=org.opencontainers.image.licenses=Apache-2.0
       - --label=org.opencontainers.image.vendor=G-Research
@@ -473,28 +473,27 @@ dockers:
     dockerfile: ./build_goreleaser/armadactl/Dockerfile
 
 changelog:
-  use:
-    github
+  use: github
   sort: asc
   abbrev: 0
   groups: # Regex use RE2 syntax as defined here: https://github.com/google/re2/wiki/Syntax.
-    - title: 'Features'
+    - title: "Features"
       regexp: '^.*?feat(\([[:word:]]+\))??!?:.+$'
       order: 100
-    - title: 'Bug fixes'
+    - title: "Bug fixes"
       regexp: '^.*?fix(\([[:word:]]+\))??!?:.+$'
       order: 200
-    - title: 'Documentation'
+    - title: "Documentation"
       regexp: '^.*?docs(\([[:word:]]+\))??!?:.+$'
       order: 300
-    - title: 'Dependency updates'
+    - title: "Dependency updates"
       regexp: '^.*?(feat|fix|chore)\(deps?.+\)!?:.+$'
       order: 400
-    - title: 'Other work'
+    - title: "Other work"
       order: 999
   filters:
     exclude:
-      - '^test:'
+      - "^test:"
       - '^.*?Bump(\([[:word:]]+\))?.+$'
 
 checksum:

diff --git a/build/armada-load-tester/Dockerfile b/build/armada-load-tester/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.17
+FROM alpine:3.18.2
 
 RUN addgroup -S -g 2000 armada && adduser -S -u 1000 armada -G armada
 

diff --git a/build/armada/Dockerfile b/build/armada/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.17
+FROM alpine:3.18.2
 
 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 @@
-FROM alpine:3.17
+FROM alpine:3.18.2
 
 RUN addgroup -S -g 2000 armada && adduser -S -u 1000 armada -G armada
 

diff --git a/build/binoculars/Dockerfile b/build/binoculars/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.17
+FROM alpine:3.18.2
 
 RUN addgroup -S -g 2000 armada && adduser -S -u 1000 armada -G armada
 

diff --git a/build/eventingester/Dockerfile b/build/eventingester/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.17
+FROM alpine:3.18.2
 
 RUN addgroup -S -g 2000 armada && adduser -S -u 1000 armada -G armada
 

diff --git a/build/executor/Dockerfile b/build/executor/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.17
+FROM alpine:3.18.2
 
 RUN addgroup -S -g 2000 armada && adduser -S -u 1000 armada -G armada
 

diff --git a/build/fakeexecutor/Dockerfile b/build/fakeexecutor/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.17
+FROM alpine:3.18.2
 
 RUN addgroup -S -g 2000 armada && adduser -S -u 1000 armada -G armada
 

diff --git a/build/jobservice/Dockerfile b/build/jobservice/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.17
+FROM alpine:3.18.2
 
 RUN addgroup -S -g 2000 armada && adduser -S -u 1000 armada -G armada
 

diff --git a/build/lookout/Dockerfile b/build/lookout/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.17
+FROM alpine:3.18.2
 
 RUN addgroup -S -g 2000 armada && adduser -S -u 1000 armada -G armada
 

diff --git a/build/lookoutingester/Dockerfile b/build/lookoutingester/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.17
+FROM alpine:3.18.2
 
 RUN addgroup -S -g 2000 armada && adduser -S -u 1000 armada -G armada
 

diff --git a/build/lookoutingesterv2/Dockerfile b/build/lookoutingesterv2/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.17
+FROM alpine:3.18.2
 
 RUN addgroup -S -g 2000 armada && adduser -S -u 1000 armada -G armada
 

diff --git a/build/lookoutv2/Dockerfile b/build/lookoutv2/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.17
+FROM alpine:3.18.2
 
 RUN addgroup -S -g 2000 armada && adduser -S -u 1000 armada -G armada
 

diff --git a/build/scheduler/Dockerfile b/build/scheduler/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.17
+FROM alpine:3.18.2
 
 RUN addgroup -S -g 2000 armada && adduser -S -u 1000 armada -G armada
 

diff --git a/build/scheduleringester/Dockerfile b/build/scheduleringester/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.17
+FROM alpine:3.18.2
 
 RUN addgroup -S -g 2000 armada && adduser -S -u 1000 armada -G armada
 

diff --git a/build/testsuite/Dockerfile b/build/testsuite/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.17
+FROM alpine:3.18.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
@@ -1,4 +1,4 @@
-ARG BASE_IMAGE=alpine:3.17.0
+ARG BASE_IMAGE=alpine:3.18.2.0
 FROM ${BASE_IMAGE}
 
 LABEL org.opencontainers.image.title=armadactl

diff --git a/build_goreleaser/binoculars/Dockerfile b/build_goreleaser/binoculars/Dockerfile
@@ -1,4 +1,4 @@
-ARG BASE_IMAGE=alpine:3.17.0
+ARG BASE_IMAGE=alpine:3.18.2.0
 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
@@ -1,4 +1,4 @@
-ARG BASE_IMAGE=alpine:3.17.0
+ARG BASE_IMAGE=alpine:3.18.2.0
 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
@@ -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.17.0
+ARG BASE_IMAGE=alpine:3.18.2.0
 
 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
@@ -1,4 +1,4 @@
-ARG BASE_IMAGE=alpine:3.17.0
+ARG BASE_IMAGE=alpine:3.18.2.0
 
 FROM ${BASE_IMAGE}
 LABEL org.opencontainers.image.title=armada-lookout-bundle

diff --git a/build_goreleaser/eventingester/Dockerfile b/build_goreleaser/eventingester/Dockerfile
@@ -1,4 +1,4 @@
-ARG BASE_IMAGE=alpine:3.17.0
+ARG BASE_IMAGE=alpine:3.18.2.0
 
 FROM ${BASE_IMAGE}
 LABEL org.opencontainers.image.title=eventingester

diff --git a/build_goreleaser/executor/Dockerfile b/build_goreleaser/executor/Dockerfile
@@ -1,4 +1,4 @@
-ARG BASE_IMAGE=alpine:3.17.0
+ARG BASE_IMAGE=alpine:3.18.2.0
 
 FROM ${BASE_IMAGE}
 LABEL org.opencontainers.image.title=executor

diff --git a/build_goreleaser/fakeexecutor/Dockerfile b/build_goreleaser/fakeexecutor/Dockerfile
@@ -1,4 +1,4 @@
-ARG BASE_IMAGE=alpine:3.17.0
+ARG BASE_IMAGE=alpine:3.18.2.0
 FROM ${BASE_IMAGE}
 LABEL org.opencontainers.image.title=fakeexecutor
 LABEL org.opencontainers.image.description="Fake Executor"

diff --git a/build_goreleaser/jobservice/Dockerfile b/build_goreleaser/jobservice/Dockerfile
@@ -1,4 +1,4 @@
-ARG BASE_IMAGE=alpine:3.17.0
+ARG BASE_IMAGE=alpine:3.18.2.0
 
 FROM ${BASE_IMAGE}
 LABEL org.opencontainers.image.title=jobservice

diff --git a/build_goreleaser/lookout/Dockerfile b/build_goreleaser/lookout/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.17.0
+ARG BASE_IMAGE=alpine:3.18.2.0
 
 FROM ${OPENAPI_BUILD_IMAGE} AS OPENAPI
 

diff --git a/build_goreleaser/lookoutingester/Dockerfile b/build_goreleaser/lookoutingester/Dockerfile
@@ -1,4 +1,4 @@
-ARG BASE_IMAGE=alpine:3.17.0
+ARG BASE_IMAGE=alpine:3.18.2.0
 
 FROM ${BASE_IMAGE}
 LABEL org.opencontainers.image.title=lookoutingester

diff --git a/build_goreleaser/lookoutingesterv2/Dockerfile b/build_goreleaser/lookoutingesterv2/Dockerfile
@@ -1,4 +1,4 @@
-ARG BASE_IMAGE=alpine:3.17.0
+ARG BASE_IMAGE=alpine:3.18.2.0
 
 FROM ${BASE_IMAGE}
 LABEL org.opencontainers.image.title=lookoutingesterv2

diff --git a/build_goreleaser/lookoutv2/Dockerfile b/build_goreleaser/lookoutv2/Dockerfile
@@ -1,4 +1,4 @@
-ARG BASE_IMAGE=alpine:3.17.0
+ARG BASE_IMAGE=alpine:3.18.2.0
 FROM ${BASE_IMAGE}
 RUN addgroup -S -g 2000 armada && adduser -S -u 1000 armada -G armada
 LABEL org.opencontainers.image.title=lookoutv2

diff --git a/build_goreleaser/scheduler/Dockerfile b/build_goreleaser/scheduler/Dockerfile
@@ -1,4 +1,4 @@
-ARG BASE_IMAGE=alpine:3.17.0
+ARG BASE_IMAGE=alpine:3.18.2.0
 
 FROM ${BASE_IMAGE}
 LABEL org.opencontainers.image.title=scheduler

diff --git a/build_goreleaser/scheduleringester/Dockerfile b/build_goreleaser/scheduleringester/Dockerfile
@@ -1,4 +1,4 @@
-ARG BASE_IMAGE=alpine:3.17.0
+ARG BASE_IMAGE=alpine:3.18.2.0
 
 FROM ${BASE_IMAGE}
 LABEL org.opencontainers.image.title=scheduleringester

diff --git a/build_goreleaser/server/Dockerfile b/build_goreleaser/server/Dockerfile
@@ -1,4 +1,4 @@
-ARG BASE_IMAGE=alpine:3.17.0
+ARG BASE_IMAGE=alpine:3.18.2.0
 
 FROM ${BASE_IMAGE}
 LABEL org.opencontainers.image.title=armada-server

diff --git a/build_goreleaser/testsuite/Dockerfile b/build_goreleaser/testsuite/Dockerfile
@@ -1,4 +1,4 @@
-ARG BASE_IMAGE=alpine:3.17.0
+ARG BASE_IMAGE=alpine:3.18.2.0
 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.17
+				  image: alpine:3.18.2
 				  command:
 					- sh
 				  args:

diff --git a/deployment/lookout-migration/templates/job.yaml b/deployment/lookout-migration/templates/job.yaml
@@ -25,7 +25,7 @@ spec:
       {{- end }}
       initContainers:
         - name: db-wait
-          image: alpine:3.17
+          image: alpine:3.18.2
           command:
             - /bin/sh
             - -c

diff --git a/e2e/armadactl_test/armadactl_test.go b/e2e/armadactl_test/armadactl_test.go
@@ -179,7 +179,7 @@ jobs:
       containers:
         - name: ls
           imagePullPolicy: IfNotPresent
-          image: alpine:3.17
+          image: alpine:3.18.2
           command:
             - sh
             - -c