Update to new stable alpine version v3.16

aledbf · roboquat · commit 5ed1deb66168 · 2022-06-07T15:33:17.000+05:30
diff --git a/components/blobserve/leeway.Dockerfile b/components/blobserve/leeway.Dockerfile
@@ -2,7 +2,7 @@
 # Licensed under the GNU Affero General Public License (AGPL).
 # See License-AGPL.txt in the project root for license information.
 
-FROM alpine:3.15
+FROM alpine:3.16
 
 # Ensure latest packages are present, like security updates.
 RUN  apk upgrade --no-cache \
diff --git a/components/content-service/leeway.Dockerfile b/components/content-service/leeway.Dockerfile
@@ -2,7 +2,7 @@
 # Licensed under the GNU Affero General Public License (AGPL).
 # See License-AGPL.txt in the project root for license information.
 
-FROM alpine:3.15
+FROM alpine:3.16
 
 # Ensure latest packages are present, like security updates.
 RUN  apk upgrade --no-cache \
diff --git a/components/dashboard/leeway.Dockerfile b/components/dashboard/leeway.Dockerfile
@@ -2,7 +2,7 @@
 # Licensed under the GNU Affero General Public License (AGPL).
 # See License-AGPL.txt in the project root for license information.
 
-FROM alpine:3.15 as compress
+FROM alpine:3.16 as compress
 
 RUN apk add brotli gzip
 
diff --git a/components/ee/agent-smith/leeway.Dockerfile b/components/ee/agent-smith/leeway.Dockerfile
@@ -2,7 +2,7 @@
 # Licensed under the Gitpod Enterprise Source Code License,
 # See License.enterprise.txt in the project root folder.
 
-FROM alpine:3.15
+FROM alpine:3.16
 
 RUN apk add --no-cache git bash ca-certificates
 COPY components-ee-agent-smith--app/agent-smith /app/
diff --git a/components/ide-proxy/Dockerfile b/components/ide-proxy/Dockerfile
@@ -2,7 +2,7 @@
 # Licensed under the GNU Affero General Public License (AGPL).
 # See License-AGPL.txt in the project root for license information.
 
-FROM alpine:3.15 as compress
+FROM alpine:3.16 as compress
 
 RUN apk add brotli gzip
 
diff --git a/components/ide/jetbrains/image/leeway.Dockerfile b/components/ide/jetbrains/image/leeway.Dockerfile
@@ -2,7 +2,7 @@
 # Licensed under the GNU Affero General Public License (AGPL).
 # See License-AGPL.txt in the project root for license information.
 
-FROM alpine:3.15 as download
+FROM alpine:3.16 as download
 ARG JETBRAINS_BACKEND_URL
 WORKDIR /workdir
 RUN apk add --no-cache --upgrade curl gzip tar unzip
diff --git a/components/image-builder-mk3/leeway.Dockerfile b/components/image-builder-mk3/leeway.Dockerfile
@@ -2,7 +2,7 @@
 # Licensed under the GNU Affero General Public License (AGPL).
 # See License-AGPL.txt in the project root for license information.
 
-FROM alpine:3.15
+FROM alpine:3.16
 
 # Ensure latest packages are present, like security updates.
 RUN  apk upgrade --no-cache \
diff --git a/components/installation-telemetry/leeway.Dockerfile b/components/installation-telemetry/leeway.Dockerfile
@@ -2,7 +2,7 @@
 # Licensed under the GNU Affero General Public License (AGPL).
 # See License-AGPL.txt in the project root for license information.
 
-FROM alpine:3.15
+FROM alpine:3.16
 COPY components-installation-telemetry--app/installation-telemetry /app/installation-telemetry
 ENTRYPOINT [ "/app/installation-telemetry" ]
 CMD [ "help" ]
diff --git a/components/leeway.Dockerfile b/components/leeway.Dockerfile
@@ -2,5 +2,5 @@
 # Licensed under the GNU Affero General Public License (AGPL).
 # See License-AGPL.txt in the project root for license information.
 
-FROM alpine:3.15
+FROM alpine:3.16
 COPY components--all-docker/versions.yaml components--all-docker/provenance-bundle.jsonl /
diff --git a/components/local-app/leeway.Dockerfile b/components/local-app/leeway.Dockerfile
@@ -2,7 +2,7 @@
 # Licensed under the GNU Affero General Public License (AGPL).
 # See License-AGPL.txt in the project root for license information.
 
-FROM alpine:3.15
+FROM alpine:3.16
 
 WORKDIR /app
 COPY components-local-app--app/components-local-app--app-linux-amd64/local-app local-app-linux
diff --git a/components/openvsx-proxy/leeway.Dockerfile b/components/openvsx-proxy/leeway.Dockerfile
@@ -2,7 +2,7 @@
 # Licensed under the GNU Affero General Public License (AGPL).
 # See License-AGPL.txt in the project root for license information.
 
-FROM alpine:3.15
+FROM alpine:3.16
 
 # Ensure latest packages are present, like security updates.
 RUN  apk upgrade --no-cache \
diff --git a/components/proxy/Dockerfile b/components/proxy/Dockerfile
@@ -22,7 +22,7 @@ RUN xcaddy build v2.4.5 \
   --with github.com/gitpod-io/gitpod/proxy/plugins/jsonselect=/plugins/jsonselect \
   --with github.com/gitpod-io/gitpod/proxy/plugins/sshtunnel=/plugins/sshtunnel
 
-FROM alpine:3.15
+FROM alpine:3.16
 
 # Ensure latest packages are present, like security updates.
 RUN  apk upgrade --no-cache \
diff --git a/components/public-api-server/leeway.Dockerfile b/components/public-api-server/leeway.Dockerfile
@@ -2,7 +2,7 @@
 # Licensed under the GNU Affero General Public License (AGPL).
 # See License-AGPL.txt in the project root for license information.
 
-FROM alpine:3.15
+FROM alpine:3.16
 
 # Ensure latest packages are present, like security updates.
 RUN  apk upgrade --no-cache \
diff --git a/components/registry-facade/leeway.Dockerfile b/components/registry-facade/leeway.Dockerfile
@@ -2,7 +2,7 @@
 # Licensed under the GNU Affero General Public License (AGPL).
 # See License-AGPL.txt in the project root for license information.
 
-FROM alpine:3.15
+FROM alpine:3.16
 
 # Ensure latest packages are present, like security updates.
 RUN  apk upgrade --no-cache \
diff --git a/components/service-waiter/leeway.Dockerfile b/components/service-waiter/leeway.Dockerfile
@@ -2,7 +2,7 @@
 # Licensed under the GNU Affero General Public License (AGPL).
 # See License-AGPL.txt in the project root for license information.
 
-FROM alpine:3.15
+FROM alpine:3.16
 
 # Ensure latest packages are present, like security updates.
 RUN  apk upgrade --no-cache \
diff --git a/components/supervisor/openssh/leeway.Dockerfile b/components/supervisor/openssh/leeway.Dockerfile
@@ -20,7 +20,7 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 # This Dockerfile was taken from https://github.com/ep76/docker-openssh-static and adapted.
-FROM alpine:3.15 AS builder
+FROM alpine:3.16 AS builder
 
 ARG openssh_url=https://github.com/openssh/openssh-portable/archive/refs/tags/V_9_0_P1.tar.gz
 
diff --git a/components/usage/leeway.Dockerfile b/components/usage/leeway.Dockerfile
@@ -2,7 +2,7 @@
 # Licensed under the GNU Affero General Public License (AGPL).
 # See License-AGPL.txt in the project root for license information.
 
-FROM alpine:3.15
+FROM alpine:3.16
 
 # Ensure latest packages are present, like security updates.
 RUN  apk upgrade --no-cache \
diff --git a/components/ws-daemon/debug.Dockerfile b/components/ws-daemon/debug.Dockerfile
@@ -2,7 +2,7 @@ FROM golang:1.16-alpine AS debugger
 RUN apk add --no-cache git
 RUN go get -u github.com/go-delve/delve/cmd/dlv
 
-FROM alpine:3.15
+FROM alpine:3.16
 
 # Ensure latest packages are present, like security updates.
 RUN  apk upgrade --no-cache \
diff --git a/components/ws-daemon/leeway.Dockerfile b/components/ws-daemon/leeway.Dockerfile
@@ -2,13 +2,13 @@
 # Licensed under the GNU Affero General Public License (AGPL).
 # See License-AGPL.txt in the project root for license information.
 
-FROM alpine:3.15 as dl
+FROM alpine:3.16 as dl
 WORKDIR /dl
 RUN apk add --no-cache curl \
   && curl -OL https://github.com/opencontainers/runc/releases/download/v1.0.1/runc.amd64 \
   && chmod +x runc.amd64
 
-FROM alpine:3.15
+FROM alpine:3.16
 
 RUN apk upgrade \
   && rm -rf /var/cache/apk/*
diff --git a/components/ws-daemon/seccomp-profile-installer/leeway.Dockerfile b/components/ws-daemon/seccomp-profile-installer/leeway.Dockerfile
@@ -2,7 +2,7 @@
 # Licensed under the GNU Affero General Public License (AGPL).
 # See License-AGPL.txt in the project root for license information.
 
-FROM alpine:3.15
+FROM alpine:3.16
 
 # Ensure latest packages are present, like security updates.
 RUN  apk upgrade --no-cache
diff --git a/components/ws-manager/debug.Dockerfile b/components/ws-manager/debug.Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.15
+FROM alpine:3.16
 
 # Ensure latest packages are present, like security updates.
 RUN  apk upgrade --no-cache \
diff --git a/components/ws-manager/leeway.Dockerfile b/components/ws-manager/leeway.Dockerfile
@@ -2,7 +2,7 @@
 # Licensed under the GNU Affero General Public License (AGPL).
 # See License-AGPL.txt in the project root for license information.
 
-FROM alpine:3.15
+FROM alpine:3.16
 
 # Ensure latest packages are present, like security updates.
 RUN  apk upgrade --no-cache \
diff --git a/components/ws-proxy/leeway.Dockerfile b/components/ws-proxy/leeway.Dockerfile
@@ -2,7 +2,7 @@
 # Licensed under the GNU Affero General Public License (AGPL).
 # See License-AGPL.txt in the project root for license information.
 
-FROM alpine:3.15
+FROM alpine:3.16
 
 # Ensure latest packages are present, like security updates.
 RUN  apk upgrade --no-cache \
diff --git a/dev/changelog/leeway.Dockerfile b/dev/changelog/leeway.Dockerfile
@@ -2,7 +2,7 @@
 # Licensed under the GNU Affero General Public License (AGPL).
 # See License-AGPL.txt in the project root for license information.
 
-FROM alpine:3.15
+FROM alpine:3.16
 
 # Ensure latest packages are present, like security updates.
 RUN  apk upgrade --no-cache \
diff --git a/dev/poolkeeper/leeway.Dockerfile b/dev/poolkeeper/leeway.Dockerfile
@@ -2,7 +2,7 @@
 # Licensed under the GNU Affero General Public License (AGPL).
 # See License-AGPL.txt in the project root for license information.
 
-FROM alpine:3.15
+FROM alpine:3.16
 
 # Ensure latest packages are present, like security updates.
 RUN  apk upgrade --no-cache \
diff --git a/install/installer/leeway.Dockerfile b/install/installer/leeway.Dockerfile
@@ -2,7 +2,7 @@
 # Licensed under the GNU Affero General Public License (AGPL).
 # See License-AGPL.txt in the project root for license information.
 
-FROM alpine:3.15
+FROM alpine:3.16
 COPY --from=alpine/helm:3.8.0 /usr/bin/helm /usr/bin/helm
 COPY install-installer--app/installer install-installer--app/provenance-bundle.jsonl /app/
 RUN apk add --no-cache curl jq yq  \
diff --git a/test/leeway.Dockerfile b/test/leeway.Dockerfile
@@ -2,7 +2,7 @@
 # Licensed under the GNU Affero General Public License (AGPL).
 # See License-AGPL.txt in the project root for license information.
 
-FROM alpine:3.15
+FROM alpine:3.16
 
 # Ensure latest packages are present, like security updates.
 RUN  apk upgrade --no-cache \

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM alpine:3.15`
	`1`	`+FROM alpine:3.16`
`2`	`2`
`3`	`3`	`# Ensure latest packages are present, like security updates.`
`4`	`4`	`RUN apk upgrade --no-cache \`