Use main branch (#441)

StefanScherer · web-flow · commit eb0346602979 · 2020-06-18T14:16:12.000+02:00
* Fix jenkins agent name

* Use main branch
diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 # dockerfiles-windows
-[![Build status](https://ci.appveyor.com/api/projects/status/adxm3egqc5md3fe3/branch/master?svg=true)](https://ci.appveyor.com/project/StefanScherer/dockerfiles-windows/branch/master)
+[![Build status](https://ci.appveyor.com/api/projects/status/adxm3egqc5md3fe3/branch/main?svg=true)](https://ci.appveyor.com/project/StefanScherer/dockerfiles-windows/branch/main)
 
 Various Dockerfiles for Windows. Most of these can be run as Windows Containers on Windows 10, Windows Server 2016, Windows Server 1803 and Windows Server 2019.
 
diff --git a/build.ps1 b/build.ps1
@@ -4,7 +4,7 @@ Write-Host Starting build
 
 if ( $env:APPVEYOR_PULL_REQUEST_NUMBER ) {
   Write-Host Pull request $env:APPVEYOR_PULL_REQUEST_NUMBER
-  $files = $(git --no-pager diff --name-only FETCH_HEAD $(git merge-base FETCH_HEAD master))
+  $files = $(git --no-pager diff --name-only FETCH_HEAD $(git merge-base FETCH_HEAD main))
 } else {
   Write-Host Branch $env:APPVEYOR_REPO_BRANCH
   $files = $(git diff --name-only HEAD~1)
diff --git a/deploy.ps1 b/deploy.ps1
@@ -1,6 +1,6 @@
 $ErrorActionPreference = 'Stop';
 
-if ( $env:APPVEYOR_PULL_REQUEST_NUMBER -Or ! $env:APPVEYOR_REPO_BRANCH.Equals("master")) {
+if ( $env:APPVEYOR_PULL_REQUEST_NUMBER -Or ! $env:APPVEYOR_REPO_BRANCH.Equals("main")) {
   Write-Host Nothing to deploy.
   Exit 0
 }
@@ -24,7 +24,7 @@ $auth64 = [Convert]::ToBase64String($auth)
 
 if ( $env:APPVEYOR_PULL_REQUEST_NUMBER ) {
   Write-Host Pull request $env:APPVEYOR_PULL_REQUEST_NUMBER
-  $files = $(git --no-pager diff --name-only FETCH_HEAD $(git merge-base FETCH_HEAD master))
+  $files = $(git --no-pager diff --name-only FETCH_HEAD $(git merge-base FETCH_HEAD main))
 } else {
   Write-Host Branch $env:APPVEYOR_REPO_BRANCH
   $files = $(git diff --name-only HEAD~1)
diff --git a/diskspd/README.md b/diskspd/README.md
@@ -3,7 +3,7 @@
 
 A feature-rich and versatile storage testing tool, Diskspd (version 2.0.17) combines robust and granular IO workload definition with flexible runtime and output options, creating an ideal tool for synthetic storage subsystem testing and validation.
 
-* [Dockerfile](https://github.com/StefanScherer/dockerfiles-windows/blob/master/diskspd/Dockerfile)
+* [Dockerfile](https://github.com/StefanScherer/dockerfiles-windows/blob/main/diskspd/Dockerfile)
 
 See also https://aka.ms/diskspd
 
diff --git a/dockertls/README.md b/dockertls/README.md
@@ -144,6 +144,6 @@ docker run --rm `
 
 ## See also
 
-* [Dockerfile](https://github.com/StefanScherer/dockerfiles-windows/blob/master/dockertls/Dockerfile)
+* [Dockerfile](https://github.com/StefanScherer/dockerfiles-windows/blob/main/dockertls/Dockerfile)
 * [Protect the Docker daemon socket](https://docs.docker.com/engine/security/https/) docs at docker.com
 * [DockerTLS](https://github.com/Microsoft/Virtualization-Documentation/tree/master/windows-server-container-tools/DockerTLS) in Microsoft/Virtualization-Documentation repo
diff --git a/golang/README.md b/golang/README.md
@@ -6,7 +6,7 @@ The only reason for this image is to provide a Golang + Git image as Nanoserver
 
 # Supported tags and respective Dockerfile links
 
-* 1.8beta2, latest [(Dockerfile)](https://github.com/StefanScherer/dockerfiles-windows/blob/master/golang/Dockerfile)
+* 1.8beta2, latest [(Dockerfile)](https://github.com/StefanScherer/dockerfiles-windows/blob/main/golang/Dockerfile)
 
 # What is Go?
 Go (a.k.a., Golang) is a programming language first developed at Google. It is a statically-typed language with syntax loosely derived from C, but with additional features such as garbage collection, type safety, some dynamic-typing capabilities, additional built-in types (e.g., variable-length arrays and key-value maps), and a large standard library.
diff --git a/jenkins-swarm-agent/Dockerfile b/jenkins-swarm-agent/Dockerfile
@@ -1,13 +1,13 @@
 FROM openjdk:8-windowsservercore
 
 ENV JENKINS_SWARM_VERSION 3.3
-ENV HOME /jenkins-slave
+ENV HOME /jenkins-agent
 
-RUN mkdir \jenkins-slave
+RUN mkdir \jenkins-agent
 RUN powershell -Command Invoke-WebRequest $('https://repo.jenkins-ci.org/releases/org/jenkins-ci/plugins/swarm-client/{0}/swarm-client-{0}.jar' -f $env:JENKINS_SWARM_VERSION) -OutFile 'swarm-client.jar' -UseBasicParsing ;
 
-COPY jenkins-slave.cmd /jenkins-slave.cmd
+COPY jenkins-agent.cmd /jenkins-agent.cmd
 
-VOLUME C:\\jenkins-slave
+VOLUME C:\\jenkins-agent
 
-ENTRYPOINT [ "cmd", "/C", "C:\\jenkins-slave.cmd" ]
+ENTRYPOINT [ "cmd", "/C", "C:\\jenkins-agent.cmd" ]
diff --git a/jenkins-swarm-agent/README.md b/jenkins-swarm-agent/README.md
@@ -0,0 +1,18 @@
+# Jenkins swarm agent
+
+A Windows Jenkins Swarm agent running in a Windows Docker container.
+Based on the linux version [csanchez/jenkins-swarm-agent](https://github.com/carlossg/jenkins-swarm-agent-docker).
+
+## Building the container image
+
+```
+docker build -t jenkins-swarm-agent .
+```
+
+## Running the container
+
+To run a Docker container passing [any parameter](https://wiki.jenkins-ci.org/display/JENKINS/Swarm+Plugin#SwarmPlugin-AvailableOptions) to the agent
+
+```
+docker run jenkins-swarm-agent -master http://192.168.99.100:8080 -name windows-agent -username jenkins -password jenkins -executors 1
+```
diff --git a/jenkins-swarm-agent/build.bat b/jenkins-swarm-agent/build.bat
@@ -0,0 +1 @@
+docker build -t jenkins-swarm-agent .
diff --git a/jenkins-swarm-agent/example/Jenkinsfile b/jenkins-swarm-agent/example/Jenkinsfile
diff --git a/jenkins-swarm-agent/example/README.md b/jenkins-swarm-agent/example/README.md
diff --git a/jenkins-swarm-agent/example/jenkins.yml b/jenkins-swarm-agent/example/jenkins.yml
diff --git a/jenkins-swarm-agent/jenkins-agent.cmd b/jenkins-swarm-agent/jenkins-agent.cmd
diff --git a/jenkins-swarm-slave/README.md b/jenkins-swarm-slave/README.md
diff --git a/jenkins-swarm-slave/build.bat b/jenkins-swarm-slave/build.bat
diff --git a/openssh/README.md b/openssh/README.md
@@ -50,4 +50,4 @@ Microsoft Windows [Version 10.0.17763.437]
 ```
 
 ## Dockerfile
-- [Dockerfile](https://github.com/StefanScherer/dockerfiles-windows/blob/master/openssh/Dockerfile)
+- [Dockerfile](https://github.com/StefanScherer/dockerfiles-windows/blob/main/openssh/Dockerfile)
diff --git a/prometheus/README.md b/prometheus/README.md
@@ -33,7 +33,7 @@ $ open http://$(docker-machine ip windows):9090
 
 See the [Getting started](https://prometheus.io/docs/introduction/getting_started/) guide to learn more about Prometheus.
 
-See the script [start-prometheus.ps1](https://github.com/StefanScherer/docker-windows-box/blob/master/scripts/prometheus/start-prometheus.ps1) and [prom.yml](https://github.com/StefanScherer/docker-windows-box/blob/master/scripts/prometheus/prom.yml) to activate the Docker Metrics API and run Prometheus collecting it.
+See the script [start-prometheus.ps1](https://github.com/StefanScherer/docker-windows-box/blob/main/scripts/prometheus/start-prometheus.ps1) and [prom.yml](https://github.com/StefanScherer/docker-windows-box/blob/main/scripts/prometheus/prom.yml) to activate the Docker Metrics API and run Prometheus collecting it.
 
 
 ## Build
diff --git a/serverspec/README.md b/serverspec/README.md
@@ -2,7 +2,7 @@
 
 [![This image on DockerHub](https://img.shields.io/docker/pulls/stefanscherer/serverspec-windows.svg)](https://hub.docker.com/r/stefanscherer/serverspec-windows/)
 
-[Dockerfile](https://github.com/StefanScherer/dockerfiles-windows/blob/master/serverspec/Dockerfile)
+[Dockerfile](https://github.com/StefanScherer/dockerfiles-windows/blob/main/serverspec/Dockerfile)
 
 This is a Windows Docker image with [Serverspec](http://serverspec.org) installed.
 
@@ -15,7 +15,7 @@ a snapshot of your VM.
 ## Example
 
 To run the Serverspec tests create a folder `spec` with some `*_spec.rb` files.
-See the [spec](https://github.com/StefanScherer/dockerfiles-windows/tree/master/serverspec/spec) folder to selftest this Docker image for an example.
+See the [spec](https://github.com/StefanScherer/dockerfiles-windows/tree/main/serverspec/spec) folder to selftest this Docker image for an example.
 
 Run the container like this:
 
diff --git a/swarm/README.md b/swarm/README.md
@@ -12,7 +12,7 @@ Clone this repo and run the `build.bat` script.
 * Log into a Windows Server 2016 machine
 * Open a PowerShell window
 * Clone the sources
-* `wget -outfile src.zip https://github.com/StefanScherer/dockerfiles-windows/archive/master.zip`
+* `wget -outfile src.zip https://github.com/StefanScherer/dockerfiles-windows/archive/main.zip`
 * `Expand-Archive .\dockerfiles-windows.zip`
-* `cd src\dockerfiles-windows-master`
+* `cd src\dockerfiles-windows-main`
 * `.\build.bat`
diff --git a/test.ps1 b/test.ps1
@@ -4,7 +4,7 @@ Write-Host Starting test
 
 if ( $env:APPVEYOR_PULL_REQUEST_NUMBER ) {
   Write-Host Pull request $env:APPVEYOR_PULL_REQUEST_NUMBER
-  $files = $(git --no-pager diff --name-only FETCH_HEAD $(git merge-base FETCH_HEAD master))
+  $files = $(git --no-pager diff --name-only FETCH_HEAD $(git merge-base FETCH_HEAD main))
 } else {
   Write-Host Branch $env:APPVEYOR_REPO_BRANCH
   $files = $(git diff --name-only HEAD~1)
diff --git a/webserver/README.md b/webserver/README.md
@@ -1,6 +1,6 @@
 # webserver - a minimal webserver to build small Windows Docker images with some HTML content
 
-* [Dockerfile](https://github.com/StefanScherer/dockerfiles-windows/blob/master/webserver/Dockerfile)
+* [Dockerfile](https://github.com/StefanScherer/dockerfiles-windows/blob/main/webserver/Dockerfile)
 
 ## Usage
 
diff --git a/winrm/README.md b/winrm/README.md
@@ -29,4 +29,4 @@ winrm -port 55985 -username User03 -password Passw0rd -hostname localhost ipconf
 ```
 
 ## Dockerfile
-- [Dockerfile](https://github.com/StefanScherer/dockerfiles-windows/blob/master/winrm/Dockerfile)
+- [Dockerfile](https://github.com/StefanScherer/dockerfiles-windows/blob/main/winrm/Dockerfile)
