Skip to content

Commit 235655e

Browse files
kylos101kylos101
authored
[dev image] update base image (#17019)
* [dev image] fix prebuilds & include build output of dev/* in Github Action Summary Fixes prebuilds by leveraging the latest workspace-full. It also adds `pup` to our dev image, so we can more parse HTML files using CSS selectors. Lastly, it adds the output of dev/* builds to our Github Action summary, while removing the output from dev/image, which is too large. * A couple more dev-environment references
1 parent 3682053 commit 235655e

20 files changed

+44
-27
lines changed

‎.github/actions/delete-preview/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM eu.gcr.io/gitpod-core-dev/dev/dev-environment:kylos101-jam-dev-image.2
1+
FROM eu.gcr.io/gitpod-core-dev/dev/dev-environment:kylos101-prebuild-jam-gha.5832
22

33
USER root
44
ENV OCI_TOOL_VERSION="0.2.0"

‎.github/actions/deploy-gitpod/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM eu.gcr.io/gitpod-core-dev/dev/dev-environment:kylos101-jam-dev-image.2
1+
FROM eu.gcr.io/gitpod-core-dev/dev/dev-environment:kylos101-prebuild-jam-gha.5832
22

33
USER root
44
ENV OCI_TOOL_VERSION="0.2.0"

‎.github/actions/deploy-monitoring-satellite/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM eu.gcr.io/gitpod-core-dev/dev/dev-environment:kylos101-jam-dev-image.2
1+
FROM eu.gcr.io/gitpod-core-dev/dev/dev-environment:kylos101-prebuild-jam-gha.5832
22

33
USER root
44
ENV OCI_TOOL_VERSION="0.2.0"

‎.github/actions/preview-create/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM eu.gcr.io/gitpod-core-dev/dev/dev-environment:kylos101-jam-dev-image.2
1+
FROM eu.gcr.io/gitpod-core-dev/dev/dev-environment:kylos101-prebuild-jam-gha.5832
22

33
USER root
44
ENV OCI_TOOL_VERSION="0.2.0"

‎.github/workflows/build.yml

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ jobs:
8181
cancel-in-progress: ${{ needs.configuration.outputs.is_main_branch == 'false' }}
8282
runs-on: [ self-hosted ]
8383
container:
84-
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:kylos101-jam-dev-image.2
84+
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:kylos101-prebuild-jam-gha.5832
8585
volumes:
8686
- /var/tmp:/var/tmp
8787
- /tmp:/tmp
@@ -149,7 +149,7 @@ jobs:
149149
ports:
150150
- 23306:23306
151151
container:
152-
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:kylos101-jam-dev-image.2
152+
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:kylos101-prebuild-jam-gha.5832
153153
volumes:
154154
- /var/tmp:/var/tmp
155155
- /tmp:/tmp
@@ -219,13 +219,26 @@ jobs:
219219
shell: bash
220220
working-directory: /workspace/gitpod
221221
run: |
222+
RESULT=0
223+
set -x
222224
leeway build dev:all \
223225
--docker-build-options network=host \
224226
--cache remote \
225227
-Dversion=$VERSION \
226228
-DlocalAppVersion=$VERSION \
227-
-DimageRepoBase=eu.gcr.io/gitpod-core-dev/dev
229+
-DimageRepoBase=eu.gcr.io/gitpod-core-dev/dev \
230+
--report large-report.html || RESULT=$?
231+
232+
set +x
228233
234+
# capture logs for the dev/image build, they're too big for GITHUB_STEP_SUMMARY
235+
pup -p -f large-report.html '[id="dev/image:docker"] + details + details' > remove.txt
236+
237+
# remove logs for the dev/image build output from the report file
238+
grep -vxFf remove.txt large-report.html > report.html
239+
240+
cat report.html >> $GITHUB_STEP_SUMMARY
241+
exit $RESULT
229242
- name: Leeway Build
230243
id: leeway
231244
shell: bash
@@ -347,7 +360,7 @@ jobs:
347360
needs: [ configuration, build-previewctl, build-gitpod, infrastructure, install ]
348361
runs-on: [ self-hosted ]
349362
container:
350-
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:kylos101-jam-dev-image.2
363+
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:kylos101-prebuild-jam-gha.5832
351364
volumes:
352365
- /var/tmp:/var/tmp
353366
- /tmp:/tmp

‎.github/workflows/ide-integration-tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
name: Configuration
2222
runs-on: [self-hosted]
2323
container:
24-
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:kylos101-jam-dev-image.2
24+
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:kylos101-prebuild-jam-gha.5832
2525
outputs:
2626
name: ${{ steps.configuration.outputs.name }}
2727
version: ${{ steps.configuration.outputs.version }}
@@ -89,7 +89,7 @@ jobs:
8989
needs: [configuration, infrastructure]
9090
runs-on: [self-hosted]
9191
container:
92-
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:kylos101-jam-dev-image.2
92+
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:kylos101-prebuild-jam-gha.5832
9393
volumes:
9494
- /var/tmp:/var/tmp
9595
- /tmp:/tmp

‎.github/workflows/preview-env-check-regressions.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ jobs:
7878
if: ${{ needs.configuration.outputs.skip == 'false' }}
7979
runs-on: [self-hosted]
8080
container:
81-
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:kylos101-kubecdl-home.1
81+
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:kylos101-prebuild-jam-gha.5832
8282
volumes:
8383
- /var/tmp:/var/tmp
8484
- /tmp:/tmp

‎.github/workflows/preview-env-gc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
name: "Find stale preview environments"
99
runs-on: [self-hosted]
1010
container:
11-
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:kylos101-jam-dev-image.2
11+
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:kylos101-prebuild-jam-gha.5832
1212
outputs:
1313
names: ${{ steps.set-matrix.outputs.names }}
1414
count: ${{ steps.set-matrix.outputs.count }}

‎.github/workflows/workspace-integration-tests.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
name: Configuration
2828
runs-on: [self-hosted]
2929
container:
30-
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:kylos101-kubecdl-home.1
30+
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:kylos101-prebuild-jam-gha.5832
3131
volumes:
3232
- /var/tmp:/var/tmp
3333
- /tmp:/tmp
@@ -137,7 +137,7 @@ jobs:
137137
needs: [configuration, infrastructure]
138138
runs-on: [self-hosted]
139139
container:
140-
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:kylos101-kubecdl-home.1
140+
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:kylos101-prebuild-jam-gha.5832
141141
volumes:
142142
- /var/tmp:/var/tmp
143143
- /tmp:/tmp
@@ -258,7 +258,7 @@ jobs:
258258
if: github.event.inputs.skip_delete != 'true' && always()
259259
runs-on: [ self-hosted ]
260260
container:
261-
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:kylos101-kubecdl-home.1
261+
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:kylos101-prebuild-jam-gha.5832
262262
volumes:
263263
- /var/tmp:/var/tmp
264264
- /tmp:/tmp

‎.gitpod.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:kylos101-jam-dev-image.2
1+
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:kylos101-prebuild-jam-gha.5832
22
workspaceLocation: gitpod/gitpod-ws.code-workspace
33
checkoutLocation: gitpod
44
ports:

‎.werft/aks-installer-tests.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ pod:
6565
secretName: self-hosted-github-oauth
6666
containers:
6767
- name: nightly-test
68-
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:kylos101-jam-dev-image.2
68+
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:kylos101-prebuild-jam-gha.5832
6969
workingDir: /workspace
7070
imagePullPolicy: Always
7171
volumeMounts:

‎.werft/build.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ pod:
7070
- name: MYSQL_TCP_PORT
7171
value: 23306
7272
- name: build
73-
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:kylos101-jam-dev-image.2
73+
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:kylos101-prebuild-jam-gha.5832
7474
workingDir: /workspace
7575
imagePullPolicy: IfNotPresent
7676
resources:

‎.werft/cleanup-installer-tests.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ pod:
2525
secretName: aks-credentials
2626
containers:
2727
- name: nightly-test
28-
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:kylos101-jam-dev-image.2
28+
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:kylos101-prebuild-jam-gha.5832
2929
workingDir: /workspace
3030
imagePullPolicy: Always
3131
volumeMounts:

‎.werft/debug.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ pod:
5454
- name: MYSQL_TCP_PORT
5555
value: 23306
5656
- name: build
57-
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:kylos101-jam-dev-image.2
57+
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:kylos101-prebuild-jam-gha.5832
5858
workingDir: /workspace
5959
imagePullPolicy: IfNotPresent
6060
volumeMounts:

‎.werft/eks-installer-tests.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ pod:
6565
secretName: self-hosted-github-oauth
6666
containers:
6767
- name: nightly-test
68-
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:kylos101-jam-dev-image.2
68+
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:kylos101-prebuild-jam-gha.5832
6969
workingDir: /workspace
7070
imagePullPolicy: Always
7171
volumeMounts:

‎.werft/gke-installer-tests.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ pod:
6565
secretName: self-hosted-github-oauth
6666
containers:
6767
- name: nightly-test
68-
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:kylos101-jam-dev-image.2
68+
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:kylos101-prebuild-jam-gha.5832
6969
workingDir: /workspace
7070
imagePullPolicy: Always
7171
volumeMounts:

‎.werft/k3s-installer-tests.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ pod:
6565
secretName: self-hosted-github-oauth
6666
containers:
6767
- name: nightly-test
68-
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:kylos101-jam-dev-image.2
68+
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:kylos101-prebuild-jam-gha.5832
6969
workingDir: /workspace
7070
imagePullPolicy: Always
7171
volumeMounts:

‎.werft/platform-trigger-werft-cleanup.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ pod:
2222
secretName: gcp-sa-gitpod-dev-deployer
2323
containers:
2424
- name: build
25-
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:kylos101-jam-dev-image.2
25+
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:kylos101-prebuild-jam-gha.5832
2626
workingDir: /workspace
2727
imagePullPolicy: IfNotPresent
2828
volumeMounts:

‎.werft/workspace-run-integration-tests.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ pod:
2222
secretName: github-token-gitpod-bot
2323
containers:
2424
- name: gcloud
25-
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:kylos101-jam-dev-image.2
25+
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:kylos101-prebuild-jam-gha.5832
2626
workingDir: /workspace
2727
imagePullPolicy: IfNotPresent
2828
env:

‎dev/image/Dockerfile

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
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 gitpod/workspace-full:2023-03-06-18-43-51
5+
FROM gitpod/workspace-full:2023-03-24-02-48-18
66

7-
ENV TRIGGER_REBUILD 26
7+
ENV TRIGGER_REBUILD 39
88

99
USER root
1010

@@ -261,3 +261,7 @@ ENV PATH=$PATH:/workspace/bin
261261
# Setting the environment variable here so that it will be accessible to all tasks and
262262
# terminal sessions in Gitpod workspaces.
263263
ENV PREVIEW_ENV_DEV_SA_KEY_PATH=/home/gitpod/.config/gcloud/preview-environment-dev-sa.json
264+
265+
# So we can parse the report.html output by leeway, and remove the output produced by this image build
266+
# why? it's too verbose, exceeding the Github Actions summary limit
267+
RUN go install github.com/ericchiang/[email protected]

0 commit comments

Comments
 (0)