make use of image

gitpod-io · Nov 22, 2023 · c2e0fa6 · c2e0fa6
1 parent 75a0f44
commit c2e0fa6
Show file tree

Hide file tree

Showing 14 changed files with 22 additions and 27 deletions.
diff --git a/.github/actions/delete-preview/Dockerfile b/.github/actions/delete-preview/Dockerfile
@@ -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"]
diff --git a/.github/actions/deploy-gitpod/Dockerfile b/.github/actions/deploy-gitpod/Dockerfile
@@ -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"]
diff --git a/.github/actions/deploy-monitoring-satellite/Dockerfile b/.github/actions/deploy-monitoring-satellite/Dockerfile
@@ -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"]
diff --git a/.github/actions/preview-create/Dockerfile b/.github/actions/preview-create/Dockerfile
@@ -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"]
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -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:
@@ -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"
@@ -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

diff --git a/.github/workflows/code-nightly.yml b/.github/workflows/code-nightly.yml
@@ -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

diff --git a/.github/workflows/ide-integration-tests.yml b/.github/workflows/ide-integration-tests.yml
@@ -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 }}
@@ -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

diff --git a/.github/workflows/lacework-inline-scanner.yml b/.github/workflows/lacework-inline-scanner.yml
@@ -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

diff --git a/.github/workflows/preview-env-check-regressions.yml b/.github/workflows/preview-env-check-regressions.yml
@@ -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

diff --git a/.github/workflows/preview-env-gc.yml b/.github/workflows/preview-env-gc.yml
@@ -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 }}

diff --git a/.github/workflows/workspace-integration-tests.yml b/.github/workflows/workspace-integration-tests.yml
@@ -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 }}
@@ -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
@@ -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

diff --git a/.gitpod.yml b/.gitpod.yml
@@ -1,4 +1,4 @@
-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:
@@ -57,12 +57,9 @@ tasks:
           (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
+      init: |
+          leeway exec --package components/supervisor-api/java:lib --package components/gitpod-protocol/java:lib --cache-key gradle_build -- ./gradlew build
+          leeway exec --package components/ide/jetbrains/backend-plugin:plugin-latest --package components/ide/jetbrains/gateway-plugin:publish-latest --parallel --cache-key gradle_buildPlugin -- ./gradlew buildPlugin
     - name: TypeScript
       init: yarn --network-timeout 100000 && yarn build
     - name: Go

diff --git a/components/server/src/workspace/gitpod-server-impl.ts b/components/server/src/workspace/gitpod-server-impl.ts
@@ -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";
@@ -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,

diff --git a/package.json b/package.json
@@ -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": [