Skip to content

Commit 26517bf

Browse files
aledbfaledbf
authored
Merge branch 'main' into aledbf/dev-env-update
2 parents c8a154b + 81a13fb commit 26517bf

File tree

94 files changed

+754
-1498
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

94 files changed

+754
-1498
lines changed

‎.devcontainer/Dockerfile

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ ARG TARGETOS
9090

9191
# Install dependencies
9292
USER root
93-
ARG LEEWAY_VERSION=0.8.2
93+
ARG LEEWAY_VERSION=0.9.6
9494
ENV LEEWAY_MAX_PROVENANCE_BUNDLE_SIZE=8388608
9595
ENV LEEWAY_WORKSPACE_ROOT=/workspace/gitpod
9696
ENV LEEWAY_REMOTE_CACHE_BUCKET=leeway-cache-dev-3ac8ef5
@@ -103,10 +103,10 @@ RUN arch=$(uname -m); \
103103
*) echo "Unsupported architecture: $arch"; exit 1 ;; \
104104
esac; \
105105
cd /tmp && \
106-
curl -OsSL https://github.com/gitpod-io/leeway/releases/download/v${LEEWAY_VERSION}/leeway_${LEEWAY_VERSION}_Linux_${arch}.tar.gz && \
107-
tar -xzf leeway_${LEEWAY_VERSION}_Linux_${arch}.tar.gz && \
106+
curl -OsSL https://github.com/gitpod-io/leeway/releases/download/v${LEEWAY_VERSION}/leeway_Linux_${arch}.tar.gz && \
107+
tar -xzf leeway_Linux_${arch}.tar.gz && \
108108
mv leeway /usr/local/bin/leeway && \
109-
rm leeway_${LEEWAY_VERSION}_Linux_${arch}.tar.gz
109+
rm leeway_Linux_${arch}.tar.gz
110110

111111

112112
### cloud_sql_proxy ###
@@ -123,7 +123,7 @@ RUN mkdir -p /tmp/helm/ \
123123
&& helm completion bash > /usr/share/bash-completion/completions/helm
124124

125125
### kubectl ###
126-
RUN curl -fsSL -o /usr/bin/kubectl "https://dl.k8s.io/release/v1.28.9/bin/linux/${TARGETARCH}/kubectl" && chmod +x /usr/bin/kubectl \
126+
RUN curl -fsSL -o /usr/bin/kubectl "https://dl.k8s.io/release/v1.31.0/bin/linux/${TARGETARCH}/kubectl" && chmod +x /usr/bin/kubectl \
127127
&& kubectl completion bash > /usr/share/bash-completion/completions/kubectl
128128

129129
RUN curl -fsSL -o /usr/bin/kubectx https://raw.githubusercontent.com/ahmetb/kubectx/master/kubectx && chmod +x /usr/bin/kubectx \
@@ -140,7 +140,7 @@ RUN curl -fsSL https://pkgs.tailscale.com/stable/ubuntu/focal.gpg | sudo apt-key
140140
RUN cd /usr/bin && curl -fsSL https://github.com/cert-manager/cert-manager/releases/download/v1.13.0/cmctl-linux-amd64.tar.gz | tar xzv --no-anchored cmctl
141141

142142
# gokart
143-
RUN cd /usr/bin && curl -fsSL https://github.com/praetorian-inc/gokart/releases/download/v0.4.0/gokart_0.4.0_linux_x86_64.tar.gz | tar xzv --no-anchored gokart
143+
RUN cd /usr/bin && curl -fsSL https://github.com/praetorian-inc/gokart/releases/download/v0.5.1/gokart_0.5.1_linux_x86_64.tar.gz | tar xzv --no-anchored gokart
144144

145145
# evans (gRPC client)
146146
RUN cd /usr/bin && curl -fsSL https://github.com/ktr0731/evans/releases/download/v0.10.6/evans_linux_${TARGETARCH}.tar.gz | tar xz evans
@@ -188,7 +188,7 @@ RUN curl -sSL "https://awscli.amazonaws.com/awscli-exe-linux-$(arch).zip" -o aws
188188
./aws/install --bin-dir /usr/local/bin --install-dir /usr/local/aws-cli --update && \
189189
rm -rf awscliv2.zip ./aws
190190

191-
ENV GO_VERSION=1.23.3
191+
ENV GO_VERSION=1.24.1
192192
ENV GOPATH=/root/go-packages
193193
ENV GOROOT=/root/go
194194
ENV PATH=$GOROOT/bin:$GOPATH/bin:$PATH
@@ -270,7 +270,7 @@ RUN arch=$(uname -m); \
270270
*) echo "Unsupported architecture: $arch"; exit 1 ;; \
271271
esac; \
272272
mkdir -p $GCS_DIR \
273-
&& curl -fsSL https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-472.0.0-linux-${arch}.tar.gz \
273+
&& curl -fsSL https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-515.0.0-linux-${arch}.tar.gz \
274274
| tar -xzC /opt \
275275
&& /opt/google-cloud-sdk/install.sh --quiet --usage-reporting=false --bash-completion=true \
276276
--additional-components gke-gcloud-auth-plugin docker-credential-gcr alpha beta \

‎WORKSPACE.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ defaultArgs:
2323
clionDownloadUrl: "https://download.jetbrains.com/cpp/CLion-2024.3.3.tar.gz"
2424
rustroverDownloadUrl: "https://download.jetbrains.com/rustrover/RustRover-2024.3.4.tar.gz"
2525
jbBackendVersion: "latest"
26-
dockerVersion: "20.10.24"
27-
dockerComposeVersion: "2.27.0-gitpod.0"
26+
dockerVersion: "27.5.1"
27+
dockerComposeVersion: "2.34.0-gitpod.1"
2828
ipfsKuboVersion: "v0.18.0"
2929
ipfsClusterVersion: "v1.0.8"
3030
schedulerExtenderVersion: "c1925d8"

‎components/blobserve/go.mod

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/gitpod-io/gitpod/blobserve
22

3-
go 1.22.0
3+
go 1.23.0
44

55
toolchain go1.23.3
66

@@ -16,7 +16,7 @@ require (
1616
github.com/opencontainers/image-spec v1.1.0
1717
github.com/prometheus/client_golang v1.18.0
1818
github.com/spf13/cobra v1.7.0
19-
golang.org/x/sync v0.6.0
19+
golang.org/x/sync v0.12.0
2020
golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028
2121
)
2222

@@ -137,14 +137,14 @@ require (
137137
go.uber.org/multierr v1.11.0 // indirect
138138
go.uber.org/zap v1.27.0 // indirect
139139
go4.org v0.0.0-20230225012048-214862532bf5 // indirect
140-
golang.org/x/crypto v0.21.0 // indirect
140+
golang.org/x/crypto v0.36.0 // indirect
141141
golang.org/x/exp v0.0.0-20240213143201-ec583247a57a // indirect
142-
golang.org/x/mod v0.15.0 // indirect
143-
golang.org/x/net v0.23.0 // indirect
144-
golang.org/x/sys v0.18.0 // indirect
145-
golang.org/x/text v0.14.0 // indirect
142+
golang.org/x/mod v0.17.0 // indirect
143+
golang.org/x/net v0.25.0 // indirect
144+
golang.org/x/sys v0.31.0 // indirect
145+
golang.org/x/text v0.23.0 // indirect
146146
golang.org/x/time v0.3.0 // indirect
147-
golang.org/x/tools v0.18.0 // indirect
147+
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
148148
gonum.org/v1/gonum v0.14.0 // indirect
149149
google.golang.org/genproto/googleapis/rpc v0.0.0-20240108191215-35c7eff3a6b1 // indirect
150150
google.golang.org/grpc v1.60.1 // indirect

‎components/blobserve/go.sum

Lines changed: 14 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎components/blobserve/leeway.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Licensed under the GNU Affero General Public License (AGPL).
33
# See License.AGPL.txt in the project root for license information.
44

5-
FROM cgr.dev/chainguard/wolfi-base:latest@sha256:79884062be1fd5f698859ee4044c6d13729fabeb9eb1f34aacfc6120414f8a91
5+
FROM cgr.dev/chainguard/wolfi-base:latest@sha256:91ed94ec4e72368a9b5113f2ffb1d8e783a91db489011a89d9fad3e3816a75ba
66

77
# Ensure latest packages are present, like security updates.
88
RUN apk upgrade --no-cache \

‎components/content-service/go.mod

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/gitpod-io/gitpod/content-service
22

3-
go 1.22.0
3+
go 1.23.0
44

55
toolchain go1.23.3
66

@@ -22,8 +22,8 @@ require (
2222
github.com/opentracing/opentracing-go v1.2.0
2323
github.com/spf13/cobra v1.7.0
2424
golang.org/x/oauth2 v0.18.0
25-
golang.org/x/sync v0.6.0
26-
golang.org/x/sys v0.18.0
25+
golang.org/x/sync v0.12.0
26+
golang.org/x/sys v0.31.0
2727
golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028
2828
google.golang.org/api v0.171.0
2929
google.golang.org/grpc v1.62.1
@@ -106,9 +106,9 @@ require (
106106
go.opentelemetry.io/otel/metric v1.24.0 // indirect
107107
go.opentelemetry.io/otel/trace v1.24.0 // indirect
108108
go.uber.org/atomic v1.10.0 // indirect
109-
golang.org/x/crypto v0.21.0 // indirect
109+
golang.org/x/crypto v0.36.0 // indirect
110110
golang.org/x/net v0.23.0 // indirect
111-
golang.org/x/text v0.14.0 // indirect
111+
golang.org/x/text v0.23.0 // indirect
112112
golang.org/x/time v0.5.0 // indirect
113113
google.golang.org/appengine v1.6.8 // indirect
114114
google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9 // indirect

‎components/content-service/go.sum

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎components/content-service/leeway.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Licensed under the GNU Affero General Public License (AGPL).
33
# See License.AGPL.txt in the project root for license information.
44

5-
FROM cgr.dev/chainguard/wolfi-base:latest@sha256:79884062be1fd5f698859ee4044c6d13729fabeb9eb1f34aacfc6120414f8a91
5+
FROM cgr.dev/chainguard/wolfi-base:latest@sha256:91ed94ec4e72368a9b5113f2ffb1d8e783a91db489011a89d9fad3e3816a75ba
66

77
# Ensure latest packages are present, like security updates.
88
RUN apk upgrade --no-cache \

‎components/dashboard/leeway.Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Licensed under the GNU Affero General Public License (AGPL).
33
# See License.AGPL.txt in the project root for license information.
44

5-
FROM cgr.dev/chainguard/wolfi-base:latest@sha256:79884062be1fd5f698859ee4044c6d13729fabeb9eb1f34aacfc6120414f8a91 as compress
5+
FROM cgr.dev/chainguard/wolfi-base:latest@sha256:91ed94ec4e72368a9b5113f2ffb1d8e783a91db489011a89d9fad3e3816a75ba as compress
66

77
RUN apk add brotli gzip
88

@@ -18,7 +18,7 @@ RUN find . -type f \( -name '*.html' -o -name '*.js' -o -name '*.css' -o -name '
1818

1919
COPY components-gitpod-protocol--gitpod-schema/gitpod-schema.json /www/static/schemas/gitpod-schema.json
2020

21-
FROM caddy/caddy:2.7.6-alpine
21+
FROM caddy/caddy:2.9.1-alpine
2222

2323
COPY components-dashboard--static/conf/Caddyfile /etc/caddy/Caddyfile
2424
COPY --from=compress /www /www

‎components/docker-up/BUILD.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,8 @@ packages:
4949
- ["mv", "components-docker-up--bin-docker-up/docker-up", "docker-up"]
5050
- ["mv", "components-docker-up--bin-docker-up/checksums.txt", "checksums.txt"]
5151
- ["mv", "components-docker-up--bin-docker-up/docker-compose", "docker-compose-linux-x86_64"]
52+
- ["mv", "components-docker-up--bin-docker-up/docker-compose-linux-x86_64.provenance.json", "docker-compose-linux-x86_64.provenance.json"]
53+
- ["mv", "components-docker-up--bin-docker-up/docker-compose-linux-x86_64.sbom.json", "docker-compose-linux-x86_64.sbom.json"]
5254
- ["rm", "-r", "components-docker-up--bin-docker-up"]
5355
- ["mv", "components-docker-up--bin-runc-facade/docker-up", "runc-facade"]
5456
- ["rm", "-r", "components-docker-up--bin-runc-facade"]

0 commit comments

Comments
 (0)