Skip to content

Commit 7a93639

Browse files
committed
Merge remote-tracking branch 'upstream/main'
2 parents 3dca1a1 + 28060a0 commit 7a93639

File tree

5 files changed

+14
-14
lines changed

5 files changed

+14
-14
lines changed

.github/workflows/anchore.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
run: cd ./dockerfiles/ && docker build . --file Dockerfile --tag localbuild/testimage:latest
3939

4040
- name: Run the Anchore Grype scan action
41-
uses: anchore/scan-action@5ed195cc06065322983cae4bb31e2a751feb86fd
41+
uses: anchore/scan-action@f2ba85e044c8f5e5014c9a539328a9c78d3bfa49
4242
id: scan
4343
with:
4444
path: "."

.github/workflows/updatecli.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323

2424
# This step installs Updatecli in the runner using the updatecli-action
2525
- name: Install Updatecli in the runner
26-
uses: updatecli/updatecli-action@v2.69.0
26+
uses: updatecli/updatecli-action@v2.70.0
2727

2828
# This step runs Updatecli in Dry Run mode
2929
# It uses the "diff" command of updatecli with the specified config and values files

.gitpod/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# This Dockerfile is used to create a Gitpod workspace with GitHub CLI installed.
22

33
# We start from the Gitpod full workspace image which includes a broad range of development tools.
4-
FROM gitpod/workspace-full:2024-11-06-20-18-15
4+
FROM gitpod/workspace-full:2024-11-11-13-51-43
55

66
# The RUN command executes a series of commands in the new layer of the image and commits the results.
77
# The following commands are executed:

dockerfiles/plugins.txt

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ javax-mail-api:1.6.2-10
3333
jaxb:2.3.9-1
3434
jjwt-api:0.11.5-112.ve82dfb_224b_a_d
3535
jquery3-api:3.7.1-2
36-
junit:1307.vdd5b_2646279e
37-
locale:544.v5ee877a_46b_90
36+
junit:1309.v0078b_fecd6ed
37+
locale:546.v1609030511ca_
3838
mailer:489.vd4b_25144138f
3939
matrix-auth:3.2.3
4040
matrix-project:840.v812f627cb_578
@@ -48,18 +48,18 @@ pipeline-graph-view:382.vb_9a_27b_7b_ea_71
4848
pipeline-groovy-lib:744.v5b_556ee7c253
4949
pipeline-input-step:495.ve9c153f6067b_
5050
pipeline-milestone-step:119.vdfdc43fc3b_9a_
51-
pipeline-model-api:2.2214.vb_b_34b_2ea_9b_83
52-
pipeline-model-definition:2.2214.vb_b_34b_2ea_9b_83
53-
pipeline-model-extensions:2.2214.vb_b_34b_2ea_9b_83
51+
pipeline-model-api:2.2218.v56d0cda_37c72
52+
pipeline-model-definition:2.2218.v56d0cda_37c72
53+
pipeline-model-extensions:2.2218.v56d0cda_37c72
5454
pipeline-rest-api:2.34
5555
pipeline-stage-step:312.v8cd10304c27a_
56-
pipeline-stage-tags-metadata:2.2214.vb_b_34b_2ea_9b_83
56+
pipeline-stage-tags-metadata:2.2218.v56d0cda_37c72
5757
pipeline-stage-view:2.34
5858
plain-credentials:183.va_de8f1dd5a_2b_
5959
plugin-util-api:5.1.0
6060
resource-disposer:0.25
6161
scm-api:698.v8e3b_c788f0a_6
62-
script-security:1367.vdf2fc45f229c
62+
script-security:1369.v9b_98a_4e95b_2d
6363
snakeyaml-api:2.3-123.v13484c65210a_
6464
ssh-credentials:343.v884f71d78167
6565
ssh-slaves:2.973.v0fa_8c0dea_f9f
@@ -72,9 +72,9 @@ variant:60.v7290fc0eb_b_cd
7272
workflow-aggregator:600.vb_57cdd26fdd7
7373
workflow-api:1336.vee415d95c521
7474
workflow-basic-steps:1058.vcb_fc1e3a_21a_9
75-
workflow-cps:3990.vd281dd77a_388
76-
workflow-durable-task-step:1371.vb_7cec8f3b_95e
77-
workflow-job:1460.v28178c1ef6e6
75+
workflow-cps:3993.v3e20a_37282f8
76+
workflow-durable-task-step:1378.v6a_3e903058a_3
77+
workflow-job:1468.vcf4f5ee92395
7878
workflow-multibranch:795.ve0cb_1f45ca_9a_
7979
workflow-scm-step:427.v4ca_6512e7df1
8080
workflow-step-api:678.v3ee58b_469476

dockerfiles/sidekick/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# This Dockerfile is used to prepare a Debian-based Docker image with several utilities installed.
22

33
# We start from the Debian 'bookworm' image dated 2023-11-20.
4-
FROM debian:bookworm-20241016 as prepare-stage
4+
FROM debian:bookworm-20241111 as prepare-stage
55

66
# Copy all shell scripts from the current directory to /usr/local/bin/ in the image.
77
COPY *sh /usr/local/bin/

0 commit comments

Comments
 (0)