Skip to content

Commit 125ba25

Browse files
authored
Merge branch 'master' into updatecli_master_20863217c1acda5d7d19ed8cdce74e32a81b31d946e6c3e439bcd0d0f573f0dd
2 parents 754dde1 + c9e3f7f commit 125ba25

7 files changed

Lines changed: 7 additions & 7 deletions

File tree

alpine/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ RUN apk add --no-cache \
8686
tzdata-utils \
8787
&& rm -rf /tmp/*.apk /tmp/gcc /tmp/gcc-libs.tar* /tmp/libz /tmp/libz.tar.xz /var/cache/apk/*
8888

89-
ARG VERSION=3283.v92c105e0f819
89+
ARG VERSION=3291.vb_131b_dc231fa_
9090
ADD --chown="${user}":"${group}" "https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/${VERSION}/remoting-${VERSION}.jar" /usr/share/jenkins/agent.jar
9191
RUN chmod 0644 /usr/share/jenkins/agent.jar \
9292
&& ln -sf /usr/share/jenkins/agent.jar /usr/share/jenkins/slave.jar

build.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Param(
44
# Default build.ps1 target
55
[String] $Target = 'build',
66
# Remoting version to include
7-
[String] $RemotingVersion = '3283.v92c105e0f819',
7+
[String] $RemotingVersion = '3291.vb_131b_dc231fa_',
88
# Type of agent ("agent" or "inbound-agent")
99
[String] $AgentType = '',
1010
# Windows flavor and windows version to build

build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ OPTIND=1
77

88
target="build"
99
build_number="1"
10-
remoting_version="3283.v92c105e0f819"
10+
remoting_version="3291.vb_131b_dc231fa_"
1111
disable_env_props=0
1212
exit_result=0
1313

debian/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ RUN apt-get update \
9696
&& apt-get clean \
9797
&& rm -rf /tmp/* /var/cache/* /var/lib/apt/lists/*
9898

99-
ARG VERSION=3283.v92c105e0f819
99+
ARG VERSION=3291.vb_131b_dc231fa_
100100
ADD --chown="${user}":"${group}" "https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/${VERSION}/remoting-${VERSION}.jar" /usr/share/jenkins/agent.jar
101101
RUN chmod 0644 /usr/share/jenkins/agent.jar \
102102
&& ln -sf /usr/share/jenkins/agent.jar /usr/share/jenkins/slave.jar

docker-bake.hcl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ variable "JAVA21_VERSION" {
6161
}
6262

6363
variable "REMOTING_VERSION" {
64-
default = "3283.v92c105e0f819"
64+
default = "3291.vb_131b_dc231fa_"
6565
}
6666

6767
variable "REGISTRY" {

windows/nanoserver/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ ARG AGENT_WORKDIR=${AGENT_ROOT}/Work
100100
ENV AGENT_WORKDIR=${AGENT_WORKDIR}
101101

102102
# Get the Agent from the Jenkins Artifacts Repository
103-
ARG VERSION=3283.v92c105e0f819
103+
ARG VERSION=3291.vb_131b_dc231fa_
104104
RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 ; `
105105
Invoke-WebRequest $('https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/{0}/remoting-{0}.jar' -f $env:VERSION) -OutFile $(Join-Path C:/ProgramData/Jenkins $env:AGENT_FILENAME) -UseBasicParsing ; `
106106
Invoke-WebRequest $('https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/{0}/remoting-{0}.jar.sha1' -f $env:VERSION) -OutFile (Join-Path C:/ProgramData/Jenkins $env:AGENT_HASH_FILENAME) -UseBasicParsing ; `

windows/windowsservercore/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ ARG AGENT_WORKDIR=${AGENT_ROOT}/Work
9393
ENV AGENT_WORKDIR=${AGENT_WORKDIR}
9494

9595
# Get the Agent from the Jenkins Artifacts Repository
96-
ARG VERSION=3283.v92c105e0f819
96+
ARG VERSION=3291.vb_131b_dc231fa_
9797
RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 ; `
9898
Invoke-WebRequest $('https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/{0}/remoting-{0}.jar' -f $env:VERSION) -OutFile $(Join-Path C:/ProgramData/Jenkins $env:AGENT_FILENAME) -UseBasicParsing ; `
9999
Invoke-WebRequest $('https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/{0}/remoting-{0}.jar.sha1' -f $env:VERSION) -OutFile (Join-Path C:/ProgramData/Jenkins $env:AGENT_HASH_FILENAME) -UseBasicParsing ; `

0 commit comments

Comments
 (0)