Merge pull request #181 from jtnord/password-expiration

the /EXPIRE (sic) flag on `net user` does not set the password expiry
jenkinsci · Jun 25, 2020 · 98527ae · 98527ae
2 parents 5c8036f + 7f25751
commit 98527ae
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/11/nanoserver-1809/Dockerfile b/11/nanoserver-1809/Dockerfile
@@ -33,7 +33,8 @@ RUN $output = net users ; `
     if(-not ($output -match $env:user)) { `
         Write-Host 'user does not exist?' ; `
         net user $env:user /add /expire:never /passwordreq:no ; `
-        net localgroup Administrators /add $env:user `
+        net localgroup Administrators /add $env:user ; `
+        wmic useraccount WHERE Name=$env:user set PasswordExpires=false; `
     }
 
 COPY jenkins-agent.ps1 C:/ProgramData/Jenkins

diff --git a/11/windowsservercore-1809/Dockerfile b/11/windowsservercore-1809/Dockerfile
@@ -32,7 +32,8 @@ RUN $output = net users ; `
     if(-not ($output -match $env:user)) { `
         Write-Host 'user does not exist?' ; `
         net user $env:user /add /expire:never /passwordreq:no ; `
-        net localgroup Administrators /add $env:user `
+        net localgroup Administrators /add $env:user ; `
+        wmic useraccount WHERE Name=$env:user set PasswordExpires=false; `
     }
 
 COPY jenkins-agent.ps1 C:/ProgramData/Jenkins

diff --git a/8/nanoserver-1809/Dockerfile b/8/nanoserver-1809/Dockerfile
@@ -32,7 +32,8 @@ RUN $output = net users ; `
     if(-not ($output -match $env:user)) { `
         Write-Host 'user does not exist?' ; `
         net user $env:user /add /expire:never /passwordreq:no ; `
-        net localgroup Administrators /add $env:user `
+        net localgroup Administrators /add $env:user ; `
+        wmic useraccount WHERE Name=$env:user set PasswordExpires=false; `
     }
 
 COPY jenkins-agent.ps1 C:/ProgramData/Jenkins

diff --git a/8/windowsservercore-1809/Dockerfile b/8/windowsservercore-1809/Dockerfile
@@ -32,7 +32,8 @@ RUN $output = net users ; `
     if(-not ($output -match $env:user)) { `
         Write-Host 'user does not exist?' ; `
         net user $env:user /add /expire:never /passwordreq:no ; `
-        net localgroup Administrators /add $env:user `
+        net localgroup Administrators /add $env:user ; `
+        wmic useraccount WHERE Name=$env:user set PasswordExpires=false; `
     }
 
 COPY jenkins-agent.ps1 C:/ProgramData/Jenkins