Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to new stable alpine version v3.16 #10466

Merged
merged 1 commit into from
Jun 7, 2022
Merged

Update to new stable alpine version v3.16 #10466

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion components/blobserve/leeway.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion components/content-service/leeway.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion components/dashboard/leeway.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion components/ee/agent-smith/leeway.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down
2 changes: 1 addition & 1 deletion components/ide-proxy/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion components/ide/jetbrains/image/leeway.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion components/image-builder-mk3/leeway.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion components/installation-telemetry/leeway.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" ]
2 changes: 1 addition & 1 deletion components/leeway.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 /
2 changes: 1 addition & 1 deletion components/local-app/leeway.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion components/openvsx-proxy/leeway.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion components/proxy/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion components/public-api-server/leeway.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion components/registry-facade/leeway.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion components/service-waiter/leeway.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion components/supervisor/openssh/leeway.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion components/usage/leeway.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion components/ws-daemon/debug.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
4 changes: 2 additions & 2 deletions components/ws-daemon/leeway.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/*
Expand Down
2 changes: 1 addition & 1 deletion components/ws-daemon/seccomp-profile-installer/leeway.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion components/ws-manager/debug.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion components/ws-manager/leeway.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion components/ws-proxy/leeway.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion dev/changelog/leeway.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion dev/poolkeeper/leeway.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion install/installer/leeway.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion test/leeway.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down