Update alpine to 3.14

gitpod-io · Jul 1, 2021 · ce50d2a · ce50d2a
1 parent 3af0d30
commit ce50d2a
Show file tree

Hide file tree

Showing 27 changed files with 28 additions and 28 deletions.
diff --git a/chart/templates/proxy-deployment.yaml b/chart/templates/proxy-deployment.yaml
@@ -43,7 +43,7 @@ spec:
       enableServiceLinks: false
       initContainers:
         - name: "sysctl"
-          image: "alpine:3.13"
+          image: "alpine:3.14"
           securityContext:
             privileged: true
           command:

diff --git a/chart/values.yaml b/chart/values.yaml
@@ -224,7 +224,7 @@ components:
       requests:
         cpu: 100m
         memory: 128Mi
-    alpineImage: alpine:3.13
+    alpineImage: alpine:3.14
     selfBuildBaseImage: ""
     ports:
       rpc:

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.13
+FROM alpine:3.14
 
 # 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.13
+FROM alpine:3.14
 
 # 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.13 as compress
+FROM alpine:3.14 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.13
+FROM alpine:3.14
 
 RUN apk add --no-cache git bash ca-certificates
 COPY components-ee-agent-smith--app/agent-smith /app/

diff --git a/components/ee/ws-scheduler/leeway.Dockerfile b/components/ee/ws-scheduler/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.13
+FROM alpine:3.14
 
 # Ensure latest packages are present, like security updates.
 RUN  apk upgrade --no-cache \

diff --git a/components/image-builder/example-config.json b/components/image-builder/example-config.json
@@ -6,7 +6,7 @@
         "baseImageRepository": "eu.gcr.io/gitpod-dev/base-images",
         "workspaceImageRepository": "eu.gcr.io/gitpod-dev/workspace-images",
         "imageBuildSalt": "001",
-        "alpineImage": "alpine:3.13",
+        "alpineImage": "alpine:3.14",
         "selfBuildBaseImage": ""
     },
     "pprof": {

diff --git a/components/image-builder/leeway.Dockerfile b/components/image-builder/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.13
+FROM alpine:3.14
 
 # Ensure latest packages are present, like security updates.
 RUN  apk upgrade --no-cache \

diff --git a/components/image-builder/pkg/resolve/resolve_test.go b/components/image-builder/pkg/resolve/resolve_test.go
@@ -26,7 +26,7 @@ func TestDockerRegistryResolver(t *testing.T) {
 		Err    error
 	}{
 		{"alpine:latest", "docker.io/library/alpine:latest", nil},
-		{"alpine:3.13", "docker.io/library/alpine:3.13", nil},
+		{"alpine:3.14", "docker.io/library/alpine:3.14", nil},
 		{"gitpod/workspace-full:build-branch-master", "docker.io/gitpod/workspace-full:build-branch-master", nil},
 		{"gitpod/does-not-exist", "docker.io/gitpod/does-not-exist", fmt.Errorf("does not exist")},
 	}

diff --git a/components/image-builder/workspace-image-layer/tests/positive/alpine-withuser.dockerfile b/components/image-builder/workspace-image-layer/tests/positive/alpine-withuser.dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.13
+FROM alpine:3.14
 
 RUN apk add --no-cache --update bash
 

diff --git a/components/image-builder/workspace-image-layer/tests/positive/alpine.dockerfile b/components/image-builder/workspace-image-layer/tests/positive/alpine.dockerfile
@@ -1,3 +1,3 @@
-FROM alpine:3.13
+FROM alpine:3.14
 
 RUN apk add --no-cache --update bash
diff --git a/components/leeway.Dockerfile b/components/leeway.Dockerfile
@@ -2,6 +2,6 @@
 # Licensed under the GNU Affero General Public License (AGPL).
 # See License-AGPL.txt in the project root for license information.
 
-FROM alpine:3.13
+FROM alpine:3.14
 COPY components--all-docker/commit.yaml /
 COPY components--all-docker/versions.yaml /
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.13
+FROM alpine:3.14
 
 WORKDIR /app
 COPY components-local-app--app/components-local-app--app-linux/local-app local-app-linux

diff --git a/components/proxy/Dockerfile b/components/proxy/Dockerfile
@@ -27,7 +27,7 @@ RUN xcaddy build \
   --with github.com/caddyserver/caddy/v2=$PWD/caddy-fork \
   --with github.com/gitpod-io/gitpod/proxy/plugins=/plugins
 
-FROM alpine:3.13
+FROM alpine:3.14
 
 # 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.13
+FROM alpine:3.14
 
 # 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.13
+FROM alpine:3.14
 
 # 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.13
+FROM alpine:3.14
 
 # 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.13 as dl
+FROM alpine:3.14 as dl
 WORKDIR /dl
 RUN apk add --no-cache curl \
   && curl -OL https://github.com/opencontainers/runc/releases/download/v1.0.0-rc95/runc.amd64 \
   && chmod +x runc.amd64
 
-FROM alpine:3.13
+FROM alpine:3.14
 
 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.13
+FROM alpine:3.14
 
 # 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.13
+FROM alpine:3.14
 
 # 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.13
+FROM alpine:3.14
 
 # 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.13
+FROM alpine:3.14
 
 # 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.13
+FROM alpine:3.14
 
 # Ensure latest packages are present, like security updates.
 RUN  apk upgrade --no-cache \

diff --git a/dev/sweeper/leeway.Dockerfile b/dev/sweeper/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.13
+FROM alpine:3.14
 
 # 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
@@ -24,7 +24,7 @@ RUN echo "chart_location = \"../helm/gitpod\"" >> installer.auto.tfvars && \
     cp installer.auto.tfvars terraform/gcp && \
     rm installer.auto.tfvars
 
-FROM alpine:3.13
+FROM alpine:3.14
 
 # Ensure latest packages are present, like security updates.
 RUN  apk upgrade --no-cache

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.13
+FROM alpine:3.14
 
 # Ensure latest packages are present, like security updates.
 RUN  apk upgrade --no-cache \