Skip to content

Commit 5cef4cc

Browse files
committed
Merge remote-tracking branch 'upstream/main'
2 parents 270a3d4 + 2010fed commit 5cef4cc

File tree

4 files changed

+14
-14
lines changed

4 files changed

+14
-14
lines changed

.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:2025-03-12-22-01-49
4+
FROM gitpod/workspace-full:2025-03-18-13-03-22
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/gitpodURL.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ config_file="/workspace/quickstart-tutorials/dockerfiles/jenkins.yaml"
77
service_url=$(echo "$GITPOD_WORKSPACE_URL" | awk -F/ '{print $3}')
88

99
# Define an array of targets
10-
targets=("maven" "node" "python" "multi" "cpp" "default")
10+
targets=("maven" "node" "python" "multi" "cpp" "dotnet" "default")
1111

1212
# Initialize an empty string for the message
1313
message="As a gentle reminder, the current profiles are: "

dockerfiles/plugins.txt

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@ apache-httpcomponents-client-4-api:4.5.14-269.vfa_2321039a_83
44
bootstrap5-api:5.3.3-2
55
bouncycastle-api:2.30.1.80-256.vf98926042a_9b_
66
branch-api:2.1214.v3f652804588d
7-
build-timeout:1.36
7+
build-timeout:1.37
88
caffeine-api:3.2.0-161.v691ef352cee1
99
checks-api:367.v18b_7f530e54a_
10-
cloudbees-folder:6.985.va_f1635030cc5
10+
cloudbees-folder:6.991.v1d5f531726d0
1111
commons-lang3-api:3.17.0-84.vb_b_938040b_078
1212
commons-text-api:1.13.0-153.v91dcd89e2a_22
13-
configuration-as-code:1932.v75cb_b_f1b_698d
13+
configuration-as-code:1947.v7d33fe23569c
1414
coverage:2.2.0
1515
credentials-binding:687.v619cb_15e923f
16-
credentials:1408.va_622a_b_f5b_1b_1
16+
credentials:1413.va_51c53703df1
1717
display-url-api:2.209.v582ed814ff2f
1818
durable-task:587.v84b_877235b_45
1919
echarts-api:5.6.0-2
@@ -34,11 +34,11 @@ javax-mail-api:1.6.2-11
3434
jaxb:2.3.9-133.vb_ec76a_73f706
3535
jjwt-api:0.11.5-120.v0268cf544b_89
3636
jquery3-api:3.7.1-3
37-
junit:1317.v5b_35d792b_06a_
37+
junit:1319.v000471ca_e5e2
3838
locale:566.v3323643741cc
3939
mailer:489.vd4b_25144138f
40-
matrix-auth:3.2.4
41-
matrix-project:845.vffd7fa_f27555
40+
matrix-auth:3.2.5
41+
matrix-project:847.v88a_f90ff9f20
4242
metrics:4.2.21-464.vc9fa_a_0d6265d
4343
mina-sshd-api-common:2.14.0-143.v2b_362fc39576
4444
mina-sshd-api-core:2.14.0-143.v2b_362fc39576
@@ -70,12 +70,12 @@ timestamper:1.28
7070
token-macro:444.v52de7e9c573d
7171
trilead-api:2.192.vc50a_d147e369
7272
variant:70.va_d9f17f859e0
73-
workflow-aggregator:600.vb_57cdd26fdd7
74-
workflow-api:1363.v03f731255494
73+
workflow-aggregator:608.v67378e9d3db_1
74+
workflow-api:1366.vf1fb_e1a_f6b_22
7575
workflow-basic-steps:1079.vce64b_a_929c5a_
76-
workflow-cps:4043.va_fb_de6a_a_8b_f5
76+
workflow-cps:4046.v90b_1b_9edec67
7777
workflow-durable-task-step:1405.v1fcd4a_d00096
78-
workflow-job:1505.vea_4b_20a_4a_495
78+
workflow-job:1506.v77f78a_b_8cc5e
7979
workflow-multibranch:803.v08103b_87c280
8080
workflow-scm-step:437.v05a_f66b_e5ef8
8181
workflow-step-api:700.v6e45cb_a_5a_a_21

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-20250224 as prepare-stage
4+
FROM debian:bookworm-20250317 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)