Merge pull request #225 from jeffret-b/remoting-4.7

Upgrade to Remoting 4.7.
jenkinsci · Mar 24, 2021 · 498e66c · 498e66c
2 parents 362248b + 8b0b92e
commit 498e66c
Show file tree

Hide file tree

Showing 11 changed files with 12 additions and 12 deletions.
diff --git a/11/debian/Dockerfile b/11/debian/Dockerfile
@@ -20,7 +20,7 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
-ARG version=4.6-2-jdk11
+ARG version=4.7-1-jdk11
 FROM jenkins/agent:$version
 
 ARG version

diff --git a/11/windows/nanoserver-1809/Dockerfile b/11/windows/nanoserver-1809/Dockerfile
@@ -21,7 +21,7 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
-ARG VERSION=4.6-2
+ARG VERSION=4.7-1
 FROM jenkins/agent:${VERSION}-jdk11-nanoserver-1809
 
 ARG VERSION

diff --git a/11/windows/windowsservercore-1809/Dockerfile b/11/windows/windowsservercore-1809/Dockerfile
@@ -21,7 +21,7 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
-ARG VERSION=4.6-2
+ARG VERSION=4.7-1
 FROM jenkins/agent:${VERSION}-jdk11-windowsservercore-1809
 
 LABEL Description="This is a base image, which allows connecting Jenkins agents via JNLP protocols on Windows" Vendor="Jenkins Project" Version="$VERSION"

diff --git a/11/windows/windowsservercore-ltsc2019/Dockerfile b/11/windows/windowsservercore-ltsc2019/Dockerfile
@@ -21,7 +21,7 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
-ARG VERSION=4.6-2
+ARG VERSION=4.7-1
 FROM jenkins/agent:${VERSION}-jdk11-windowsservercore-ltsc2019
 
 LABEL Description="This is a base image, which allows connecting Jenkins agents via JNLP protocols on Windows" Vendor="Jenkins Project" Version="$VERSION"

diff --git a/8/alpine/Dockerfile b/8/alpine/Dockerfile
@@ -20,7 +20,7 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
-ARG version=4.6-2-alpine
+ARG version=4.7-1-alpine
 FROM jenkins/agent:$version
 
 ARG version

diff --git a/8/debian/Dockerfile b/8/debian/Dockerfile
@@ -20,7 +20,7 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
-ARG version=4.6-2
+ARG version=4.7-1
 FROM jenkins/agent:$version
 
 ARG version

diff --git a/8/windows/nanoserver-1809/Dockerfile b/8/windows/nanoserver-1809/Dockerfile
@@ -21,7 +21,7 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
-ARG VERSION=4.6-2
+ARG VERSION=4.7-1
 FROM jenkins/agent:${VERSION}-nanoserver-1809
 
 LABEL Description="This is a base image, which allows connecting Jenkins agents via JNLP protocols on Windows" Vendor="Jenkins Project" Version="$VERSION"

diff --git a/8/windows/windowsservercore-1809/Dockerfile b/8/windows/windowsservercore-1809/Dockerfile
@@ -21,7 +21,7 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
-ARG VERSION=4.6-2
+ARG VERSION=4.7-1
 FROM jenkins/agent:${VERSION}-windowsservercore-1809
 
 LABEL Description="This is a base image, which allows connecting Jenkins agents via JNLP protocols on Windows" Vendor="Jenkins Project" Version="$VERSION"

diff --git a/8/windows/windowsservercore-ltsc2019/Dockerfile b/8/windows/windowsservercore-ltsc2019/Dockerfile
@@ -21,7 +21,7 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
-ARG VERSION=4.6-2
+ARG VERSION=4.7-1
 FROM jenkins/agent:${VERSION}-windowsservercore-ltsc2019
 
 LABEL Description="This is a base image, which allows connecting Jenkins agents via JNLP protocols on Windows" Vendor="Jenkins Project" Version="$VERSION"

diff --git a/make.ps1 b/make.ps1
@@ -4,8 +4,8 @@ Param(
     [String] $Target = "build",
     [String] $AdditionalArgs = '',
     [String] $Build = '',
-    [String] $VersionTag = '4.6-2',
-    [String] $DockerAgentVersion = '4.6-2',
+    [String] $VersionTag = '4.7-1',
+    [String] $DockerAgentVersion = '4.7-1',
     [switch] $PushVersions = $false
 )
 

diff --git a/tests/inboundAgent.Tests.ps1 b/tests/inboundAgent.Tests.ps1
@@ -5,7 +5,7 @@ $AGENT_CONTAINER='pester-jenkins-inbound-agent'
 $SHELL="powershell.exe"
 
 $FOLDER = Get-EnvOrDefault 'FOLDER' ''
-$VERSION = Get-EnvOrDefault 'VERSION' '4.6-2'
+$VERSION = Get-EnvOrDefault 'VERSION' '4.7-1'
 
 $REAL_FOLDER=Resolve-Path -Path "$PSScriptRoot/../${FOLDER}"