Merge pull request #144 from slide/password_fix

Fix issue with Windows passwords expiring
jenkinsci · Jul 15, 2020 · 0c80067 · 0c80067
2 parents 826399e + a1c23d8
commit 0c80067
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 2 deletions.
diff --git a/11/windows/nanoserver-1809/Dockerfile b/11/windows/nanoserver-1809/Dockerfile
@@ -73,7 +73,8 @@ ARG user=jenkins
 ARG AGENT_FILENAME=agent.jar
 ARG AGENT_HASH_FILENAME=$AGENT_FILENAME.sha1
 
-RUN net user "$env:user" /add /expire:never /passwordreq:no ; `
+RUN net accounts /maxpwage:unlimited ; `
+    net user "$env:user" /add /expire:never /passwordreq:no ; `
     net localgroup Administrators /add $env:user ; `
     setx /M PATH '%PATH%;%JAVA_HOME%\bin' ; `
     New-Item -ItemType Directory -Path C:/ProgramData/Jenkins | Out-Null

diff --git a/11/windows/windowsservercore-1809/Dockerfile b/11/windows/windowsservercore-1809/Dockerfile
@@ -55,6 +55,7 @@ ARG AGENT_HASH_FILENAME=$AGENT_FILENAME.sha1
 
 RUN net user "$env:user" /add /expire:never /passwordreq:no ; `
     net localgroup Administrators /add $env:user ; `
+    wmic useraccount WHERE Name=$env:user set PasswordExpires=false; `
     New-Item -ItemType Directory -Path C:/ProgramData/Jenkins | Out-Null
 
 ARG AGENT_ROOT=C:/Users/$user

diff --git a/8/windows/nanoserver-1809/Dockerfile b/8/windows/nanoserver-1809/Dockerfile
@@ -75,7 +75,8 @@ ARG user=jenkins
 ARG AGENT_FILENAME=agent.jar
 ARG AGENT_HASH_FILENAME=$AGENT_FILENAME.sha1
 
-RUN net user "$env:user" /add /expire:never /passwordreq:no ; `
+RUN net accounts /maxpwage:unlimited ; `
+    net user "$env:user" /add /expire:never /passwordreq:no ; `
     net localgroup Administrators /add $env:user ; `
     New-Item -ItemType Directory -Path C:/ProgramData/Jenkins | Out-Null
 

diff --git a/8/windows/windowsservercore-1809/Dockerfile b/8/windows/windowsservercore-1809/Dockerfile
@@ -55,6 +55,7 @@ ARG AGENT_HASH_FILENAME=$AGENT_FILENAME.sha1
 
 RUN net user "$env:user" /add /expire:never /passwordreq:no ; `
     net localgroup Administrators /add $env:user ; `
+    wmic useraccount WHERE Name=$env:user set PasswordExpires=false; `
     New-Item -ItemType Directory -Path C:/ProgramData/Jenkins | Out-Null
 
 ARG AGENT_ROOT=C:/Users/$user