Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 .github/actions/delete-preview/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM eu.gcr.io/gitpod-core-dev/dev/dev-environment:aledbf-leeway-pigz-gha.18593
FROM eu.gcr.io/gitpod-core-dev/dev/dev-environment:se-update-leeway-gha.20594

COPY entrypoint.sh /entrypoint.sh
ENTRYPOINT ["/entrypoint.sh"]
2 changes: 1 addition & 1 deletion .github/actions/deploy-gitpod/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM eu.gcr.io/gitpod-core-dev/dev/dev-environment:aledbf-leeway-pigz-gha.18593
FROM eu.gcr.io/gitpod-core-dev/dev/dev-environment:se-update-leeway-gha.20594

COPY entrypoint.sh /entrypoint.sh
ENTRYPOINT ["/entrypoint.sh"]
2 changes: 1 addition & 1 deletion .github/actions/deploy-monitoring-satellite/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM eu.gcr.io/gitpod-core-dev/dev/dev-environment:aledbf-leeway-pigz-gha.18593
FROM eu.gcr.io/gitpod-core-dev/dev/dev-environment:se-update-leeway-gha.20594

COPY entrypoint.sh /entrypoint.sh
ENTRYPOINT ["/entrypoint.sh"]
2 changes: 1 addition & 1 deletion .github/actions/preview-create/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM eu.gcr.io/gitpod-core-dev/dev/dev-environment:aledbf-leeway-pigz-gha.18593
FROM eu.gcr.io/gitpod-core-dev/dev/dev-environment:se-update-leeway-gha.20594

COPY entrypoint.sh /entrypoint.sh
ENTRYPOINT ["/entrypoint.sh"]
6 changes: 3 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ jobs:
cancel-in-progress: ${{ needs.configuration.outputs.is_main_branch == 'false' }}
runs-on: ${{ needs.create-runner.outputs.label }}
container:
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:aledbf-leeway-pigz-gha.18593
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:se-update-leeway-gha.20594
outputs:
previewctl_hash: ${{ steps.build.outputs.previewctl_hash }}
steps:
Expand Down Expand Up @@ -161,7 +161,7 @@ jobs:
ports:
- 6379:6379
container:
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:aledbf-leeway-pigz-gha.18593
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:se-update-leeway-gha.20594
env:
DB_HOST: "mysql"
DB_PORT: "23306"
Expand Down Expand Up @@ -401,7 +401,7 @@ jobs:
- create-runner
runs-on: ${{ needs.create-runner.outputs.label }}
container:
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:aledbf-leeway-pigz-gha.18593
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:se-update-leeway-gha.20594
if: needs.configuration.outputs.with_integration_tests != ''
concurrency:
group: ${{ needs.configuration.outputs.preview_name }}-integration-test
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/code-nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
runs-on: ${{ needs.create-runner.outputs.label }}
needs: [create-runner]
container:
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:aledbf-leeway-pigz-gha.18593
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:se-update-leeway-gha.20594
steps:
- uses: actions/checkout@v4
- uses: ./.github/actions/setup-environment
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ide-integration-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
runs-on: ${{ needs.create-runner.outputs.label }}
needs: [create-runner]
container:
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:aledbf-leeway-pigz-gha.18593
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:se-update-leeway-gha.20594
outputs:
name: ${{ steps.configuration.outputs.name }}
version: ${{ steps.configuration.outputs.version }}
Expand Down Expand Up @@ -101,7 +101,7 @@ jobs:
needs: [configuration, infrastructure, create-runner]
runs-on: ${{ needs.create-runner.outputs.label }}
container:
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:aledbf-leeway-pigz-gha.18593
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:se-update-leeway-gha.20594
volumes:
- /var/tmp:/var/tmp
- /tmp:/tmp
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lacework-inline-scanner.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ jobs:
needs: [configuration,create-runner]
if: ${{ needs.configuration.outputs.skip == 'false' }}
container:
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:aledbf-leeway-pigz-gha.18593
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:se-update-leeway-gha.20594
steps:
# Most of this is taken over from the Build workflow/preview-env-check-regressions workflow
- uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/preview-env-check-regressions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ jobs:
if: ${{ needs.configuration.outputs.skip == 'false' }}
runs-on: ${{ needs.create-runner.outputs.label }}
container:
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:aledbf-leeway-pigz-gha.18593
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:se-update-leeway-gha.20594
volumes:
- /var/tmp:/var/tmp
- /tmp:/tmp
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/preview-env-gc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
runs-on: ${{ needs.create-runner.outputs.label }}
needs: [create-runner]
container:
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:aledbf-leeway-pigz-gha.18593
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:se-update-leeway-gha.20594
outputs:
names: ${{ steps.set-matrix.outputs.names }}
count: ${{ steps.set-matrix.outputs.count }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/workspace-integration-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
runs-on: ${{ needs.create-runner.outputs.label }}
needs: [create-runner]
container:
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:aledbf-leeway-pigz-gha.18593
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:se-update-leeway-gha.20594
outputs:
name: ${{ steps.configuration.outputs.name }}
version: ${{ steps.configuration.outputs.version }}
Expand Down Expand Up @@ -136,7 +136,7 @@ jobs:
needs: [configuration, infrastructure, create-runner]
runs-on: ${{ needs.create-runner.outputs.label }}
container:
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:aledbf-leeway-pigz-gha.18593
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:se-update-leeway-gha.20594
steps:
- uses: actions/checkout@v4
- id: auth
Expand Down Expand Up @@ -167,7 +167,7 @@ jobs:
if: inputs.skip_delete != 'true' && always()
runs-on: ${{ needs.create-runner.outputs.label }}
container:
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:aledbf-leeway-pigz-gha.18593
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:se-update-leeway-gha.20594
steps:
- uses: actions/checkout@v4
- name: Delete preview environment
Expand Down
168 changes: 84 additions & 84 deletions .gitpod.yml
Original file line number Diff line number Diff line change
@@ -1,92 +1,92 @@
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:aledbf-leeway-pigz-gha.18593
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:se-update-leeway-gha.20594
workspaceLocation: gitpod/gitpod-ws.code-workspace
checkoutLocation: gitpod
ports:
- port: 1337
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

only formatting changes 👇

onOpen: open-preview
- port: 3000
onOpen: ignore
- port: 3001
onOpen: ignore
- port: 3306
onOpen: ignore
- port: 4000
onOpen: ignore
# VNC
- port: 5900
onOpen: ignore
# noVNC
- port: 6080
onOpen: ignore
# Werft
- port: 7777
onOpen: ignore
- port: 9229
onOpen: ignore
# Go proxy
- port: 9999
onOpen: ignore
- port: 13001
onOpen: ignore
# Dev Theia
- port: 13444
# Used when using port-forwarding to SSH to preview environment VMs
- port: 8022
onOpen: ignore
- port: 1337
onOpen: open-preview
- port: 3000
onOpen: ignore
- port: 3001
onOpen: ignore
- port: 3306
onOpen: ignore
- port: 4000
onOpen: ignore
# VNC
- port: 5900
onOpen: ignore
# noVNC
- port: 6080
onOpen: ignore
# Werft
- port: 7777
onOpen: ignore
- port: 9229
onOpen: ignore
# Go proxy
- port: 9999
onOpen: ignore
- port: 13001
onOpen: ignore
# Dev Theia
- port: 13444
# Used when using port-forwarding to SSH to preview environment VMs
- port: 8022
onOpen: ignore
tasks:
- name: Remove GCP_ADC_FILE
command: |
if [[ -n "${GCP_ADC_FILE}" ]]; then
echo "$GCP_ADC_FILE" > "/home/gitpod/.config/gcloud/application_default_credentials.json"
yes | gcloud auth application-default revoke
gp env -u GCP_ADC_FILE
fi
exit 0
- name: Install `gitpod` CLI
command: |
leeway run components/local-app:install-cli
leeway run components/local-app:cli-completion
exit 0
# This task takes care of configuring your workspace so it can manage and interact
# with preview environments.
- name: Preview environment configuration
init: leeway run dev/preview/previewctl:install
command: INSTALL_CONTEXT=true leeway run dev/preview:configure-workspace
- name: Installer dependencies
init: |
(cd install/installer && make deps)
exit 0
- name: Java
command: |
if [ -z "$RUN_GRADLE_TASK" ]; then
read -r -p "Press enter to continue Java gradle task"
fi
leeway exec --package components/supervisor-api/java:lib --package components/gitpod-protocol/java:lib -- ./gradlew build
leeway exec --package components/ide/jetbrains/backend-plugin:plugin-latest --package components/ide/jetbrains/gateway-plugin:publish-latest --parallel -- ./gradlew buildPlugin
- name: TypeScript
init: yarn --network-timeout 100000 && yarn build
- name: Go
before: pre-commit install --install-hooks
init: |
./components/gitpod-protocol/go/scripts/generate-config.sh
leeway exec --filter-type go -v -- go mod verify
- name: Remove GCP_ADC_FILE
command: |
if [[ -n "${GCP_ADC_FILE}" ]]; then
echo "$GCP_ADC_FILE" > "/home/gitpod/.config/gcloud/application_default_credentials.json"
yes | gcloud auth application-default revoke
gp env -u GCP_ADC_FILE
fi
exit 0
- name: Install `gitpod` CLI
command: |
leeway run components/local-app:install-cli
leeway run components/local-app:cli-completion
exit 0
# This task takes care of configuring your workspace so it can manage and interact
# with preview environments.
- name: Preview environment configuration
init: leeway run dev/preview/previewctl:install
command: INSTALL_CONTEXT=true leeway run dev/preview:configure-workspace
- name: Installer dependencies
init: |
(cd install/installer && make deps)
exit 0
- name: Java
command: |
if [ -z "$RUN_GRADLE_TASK" ]; then
read -r -p "Press enter to continue Java gradle task"
fi
leeway exec --package components/supervisor-api/java:lib --package components/gitpod-protocol/java:lib -- ./gradlew build
leeway exec --package components/ide/jetbrains/backend-plugin:plugin-latest --package components/ide/jetbrains/gateway-plugin:publish-latest --parallel -- ./gradlew buildPlugin
- name: TypeScript
init: yarn --network-timeout 100000 && yarn build
- name: Go
before: pre-commit install --install-hooks
init: |
./components/gitpod-protocol/go/scripts/generate-config.sh
leeway exec --filter-type go -v -- go mod verify
vscode:
extensions:
- EditorConfig.EditorConfig
- golang.go
- hashicorp.terraform
- ms-azuretools.vscode-docker
- ms-kubernetes-tools.vscode-kubernetes-tools
- stkb.rewrap
- zxh404.vscode-proto3
- matthewpi.caddyfile-support
- heptio.jsonnet
- timonwong.shellcheck
- fwcd.kotlin
- dbaeumer.vscode-eslint
- esbenp.prettier-vscode
- akosyakov.gitpod-monitor
- hbenl.vscode-mocha-test-adapter
extensions:
- EditorConfig.EditorConfig
- golang.go
- hashicorp.terraform
- ms-azuretools.vscode-docker
- ms-kubernetes-tools.vscode-kubernetes-tools
- stkb.rewrap
- zxh404.vscode-proto3
- matthewpi.caddyfile-support
- heptio.jsonnet
- timonwong.shellcheck
- fwcd.kotlin
- dbaeumer.vscode-eslint
- esbenp.prettier-vscode
- akosyakov.gitpod-monitor
- hbenl.vscode-mocha-test-adapter
jetbrains:
intellij:
vmoptions: -Xmx4g
2 changes: 0 additions & 2 deletions components/server/src/workspace/gitpod-server-impl.ts
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,6 @@ import { v4 as uuidv4, validate as uuidValidate } from "uuid";
import { Disposable, CancellationToken } from "vscode-jsonrpc";
import { IAnalyticsWriter } from "@gitpod/gitpod-protocol/lib/analytics";
import { AuthProviderService } from "../auth/auth-provider-service";
import { HostContextProvider } from "../auth/host-context-provider";
import { GuardedResource, ResourceAccessGuard, ResourceAccessOp } from "../auth/resource-access";
import { Config } from "../config";
import { NotFoundError, UnauthorizedError } from "../errors";
Expand Down Expand Up @@ -179,7 +178,6 @@ export class GitpodServerImpl implements GitpodServerWithTracing, Disposable {
@inject(Config) private readonly config: Config,
@inject(TracedWorkspaceDB) private readonly workspaceDb: DBWithTracing<WorkspaceDB>,
@inject(ContextParser) private contextParser: ContextParser,
@inject(HostContextProvider) private readonly hostContextProvider: HostContextProvider,

@inject(PrebuildManager) private readonly prebuildManager: PrebuildManager,
@inject(IncrementalWorkspaceService) private readonly incrementalPrebuildsService: IncrementalWorkspaceService,
Expand Down
6 changes: 3 additions & 3 deletions dev/image/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,12 @@ RUN cd /usr/bin && curl -fsSL https://github.com/cert-manager/cert-manager/relea
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

# leeway
ARG LEEWAY_VERSION=0.7.9
ARG LEEWAY_VERSION=0.8.0
ENV LEEWAY_MAX_PROVENANCE_BUNDLE_SIZE=8388608
ENV LEEWAY_WORKSPACE_ROOT=/workspace/gitpod
ENV LEEWAY_REMOTE_CACHE_BUCKET=gitpod-core-leeway-cache-branch
ENV LEEWAY_CACHE_DIR=/var/tmp/cache
ENV LEEWAY_BUILD_DIR=/var/tmp/build
ENV LEEWAY_CACHE_DIR=/workspace/.leeway/cache
ENV LEEWAY_BUILD_DIR=/workspace/.leeway/build
RUN cd /usr/bin && curl -fsSL https://github.com/gitpod-io/leeway/releases/download/v${LEEWAY_VERSION}/leeway_${LEEWAY_VERSION}_Linux_x86_64.tar.gz | tar xz

# evans (gRPC client)
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
"typescript": "~4.4.4"
},
"scripts": {
"build": "leeway exec --filter-type yarn --components -- yarn build",
"build": "leeway exec --filter-type yarn --cache-key yarn_build -- yarn build",
"watch": "leeway exec --package components:all --transitive-dependencies --filter-type yarn --components --parallel -- tsc -w --preserveWatchOutput",
"clean": "leeway exec --filter-type yarn --components -- yarn clean && rm -rf node_modules"
"clean": "leeway exec --filter-type yarn -- yarn clean && rm -rf node_modules"
},
"workspaces": {
"packages": [
Expand Down