Skip to content
This repository has been archived by the owner on Jan 21, 2024. It is now read-only.

Rename Windows images so that a standard DockerHub repo is used #160

Merged
merged 4 commits into from
Apr 13, 2020
Merged

Rename Windows images so that a standard DockerHub repo is used #160

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9c370cb
[INFRA-1105] - Rename Windows agents in README
oleg-nenashev Apr 12, 2020
09f0df8
Rename Windows agents in make.ps1
oleg-nenashev Apr 12, 2020
7a94dc3
Stop building Windows images with shortnames
oleg-nenashev Apr 13, 2020
2e1f173
Update README.md
oleg-nenashev Apr 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <secret> -Name <agent name>
docker run jenkins/inbound-agent:latest-windows -Url http://jenkins-server:port -WorkDir=C:/Jenkins/agent -Secret <secret> -Name <agent name>
oleg-nenashev marked this conversation as resolved.
Show resolved Hide resolved

Optional environment variables:

Expand Down
6 changes: 3 additions & 3 deletions make.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Param(
[switch] $PushVersions = $false
)

$Repository = 'jnlp-agent'
$Repository = 'inbound-agent'
$Organization = 'jenkins'

if(![String]::IsNullOrWhiteSpace($env:DOCKERHUB_REPO)) {
Expand All @@ -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';
Expand Down