From 9c370cbab00b88241efc606eac111bcb3718dd52 Mon Sep 17 00:00:00 2001 From: Oleg Nenashev Date: Sun, 12 Apr 2020 23:52:15 +0200 Subject: [PATCH 1/4] [INFRA-1105] - Rename Windows agents in README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 160fe6a5..de2e65df 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@ To run a Docker container with [Work Directory](https://github.com/jenkinsci/rem Windows agent: - docker run jenkins/jnlp-agent-windows -Url http://jenkins-server:port -WorkDir=C:/Jenkins/agent -Secret -Name + docker run jenkins/inbound-agent:latest-windows -Url http://jenkins-server:port -WorkDir=C:/Jenkins/agent -Secret -Name Optional environment variables: From 09f0df865f6ddd3732a5165387997f651d720948 Mon Sep 17 00:00:00 2001 From: Oleg Nenashev Date: Sun, 12 Apr 2020 23:52:59 +0200 Subject: [PATCH 2/4] Rename Windows agents in make.ps1 --- make.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/make.ps1 b/make.ps1 index 1b9e0372..28f772ba 100644 --- a/make.ps1 +++ b/make.ps1 @@ -9,7 +9,7 @@ Param( [switch] $PushVersions = $false ) -$Repository = 'jnlp-agent' +$Repository = 'inbound-agent' $Organization = 'jenkins' if(![String]::IsNullOrWhiteSpace($env:DOCKERHUB_REPO)) { From 7a94dc3bbbfeeddeb8672c554c70d08a1d8a6b87 Mon Sep 17 00:00:00 2001 From: Oleg Nenashev Date: Mon, 13 Apr 2020 22:00:10 +0200 Subject: [PATCH 3/4] Stop building Windows images with shortnames --- make.ps1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/make.ps1 b/make.ps1 index 28f772ba..476cae92 100644 --- a/make.ps1 +++ b/make.ps1 @@ -23,11 +23,11 @@ if(![String]::IsNullOrWhiteSpace($env:DOCKERHUB_ORGANISATION)) { $builds = @{ 'jdk8' = @{ 'Folder' = '8\windowsservercore-1809'; - 'Tags' = @( "latest", "windowsservercore-1809", "jdk8", "windowsservercore-1809-jdk8" ); + 'Tags' = @( "windowsservercore-1809", "windowsservercore-1809-jdk8" ); }; 'jdk11' = @{ 'Folder' = '11\windowsservercore-1809'; - 'Tags' = @( "windowsservercore-1809-jdk11", "jdk11" ); + 'Tags' = @( "windowsservercore-1809-jdk11" ); }; 'nanoserver' = @{ 'Folder' = '8\nanoserver-1809'; From 2e1f173b3a792843a63dbc93f72ccdf853fc0836 Mon Sep 17 00:00:00 2001 From: Oleg Nenashev Date: Mon, 13 Apr 2020 22:21:22 +0200 Subject: [PATCH 4/4] Update README.md Co-Authored-By: Alex Earl --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index de2e65df..65edf03d 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@ To run a Docker container with [Work Directory](https://github.com/jenkinsci/rem Windows agent: - docker run jenkins/inbound-agent:latest-windows -Url http://jenkins-server:port -WorkDir=C:/Jenkins/agent -Secret -Name + docker run jenkins/inbound-agent:windowsservercore-1809 -Url http://jenkins-server:port -WorkDir=C:/Jenkins/agent -Secret -Name Optional environment variables: