Skip to content

Commit 1518aaf

Browse files
committed
[jenkins] removed my simple_monitor.ps1, now using ServiceMonitor
1 parent 6fcf98f commit 1518aaf

File tree

2 files changed

+3
-15
lines changed

2 files changed

+3
-15
lines changed

windowsservercore/jenkins/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ EXPOSE 8080 50000
77
VOLUME C:/JENKINS_HOME
88

99
COPY noStart.mst C:/
10-
COPY simple_monitor.ps1 C:/
1110

1211
RUN powershell -Command \
13-
wget http://mirrors.jenkins-ci.org/windows-stable/jenkins-%JENKINS_VERSION%.zip -OutFile \jenkins-%JENKINS_VERSION%.zip; \
12+
Invoke-WebRequest -UseBasicParsing -Uri "https://dotnetbinaries.blob.core.windows.net/servicemonitor/2.0.1.3/ServiceMonitor.exe" -OutFile \ServiceMonitor.exe; \
13+
Invoke-WebRequest http://mirrors.jenkins-ci.org/windows-stable/jenkins-%JENKINS_VERSION%.zip -OutFile \jenkins-%JENKINS_VERSION%.zip; \
1414
Expand-Archive -Path \jenkins-%JENKINS_VERSION%.zip -DestinationPath /; \
1515
Start-Process -FilePath msiexec.exe -ArgumentList /i, jenkins.msi, TRANSFORMS=noStart.mst, /qn, /L, jenkins.install.log -PassThru -Wait; \
1616
rm \jenkins-%JENKINS_VERSION%.zip; \
@@ -20,4 +20,4 @@ RUN powershell -Command \
2020
$xml.service.env.value = \"%JENKINS_HOME%\"; \
2121
$xml.Save(\"%ProgramFiles(x86)%\Jenkins\Jenkins.xml\");
2222

23-
ENTRYPOINT ["C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\powershell.exe", "c:\\simple_monitor.ps1"]
23+
ENTRYPOINT ["C:\\ServiceMonitor.exe", "jenkins"]

windowsservercore/jenkins/simple_monitor.ps1

Lines changed: 0 additions & 12 deletions
This file was deleted.

0 commit comments

Comments
 (0)