diff --git a/11/debian/Dockerfile b/11/debian/Dockerfile index 30a57870..92037c4e 100644 --- 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 index 9e6014c5..dbf5fcab 100644 --- 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 index d3a77fe8..6277355e 100644 --- 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 index c353267c..a5453cd6 100644 --- 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 index 2246a046..fd7a06f3 100644 --- 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 index 586064f2..27dcd7c6 100644 --- 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 index f36f4b81..11821f9f 100644 --- 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 index 7f54ab64..ba18e826 100644 --- 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 index bb1353bd..dbc795c3 100644 --- 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 index 40d64a8c..04bb2cb7 100644 --- 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 index fbfa0c68..a2e72bdc 100644 --- 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}"