[jenkins] change to new style; up to 2.121.3.

[nginx] change to new style dockerfile. added support for sites-enabled,
sites-available, with default.conf and minimum nginx.conf

Author: xied75

windowsservercore/jenkins/Dockerfile

@@ -1,23 +1,35 @@
+# escape=`
+
 FROM microsoft/windowsservercore:10.0.14393.2312
 LABEL maintainer="xied75@gmail.com"
 
-ENV JENKINS_VERSION=2.121.1 JENKINS_HOME=C:/JENKINS_HOME
+SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 
-EXPOSE 8080 50000
-VOLUME C:/JENKINS_HOME
+ENV JENKINS_VERSION=2.121.3 JENKINS_HOME=C:/JENKINS_HOME
 
 COPY noStart.mst C:/
 
-RUN powershell -Command \
-    Invoke-WebRequest -UseBasicParsing -Uri "https://dotnetbinaries.blob.core.windows.net/servicemonitor/2.0.1.3/ServiceMonitor.exe" -OutFile \ServiceMonitor.exe; \
-    Invoke-WebRequest http://mirrors.jenkins-ci.org/windows-stable/jenkins-%JENKINS_VERSION%.zip -OutFile \jenkins-%JENKINS_VERSION%.zip; \
-    Expand-Archive -Path \jenkins-%JENKINS_VERSION%.zip -DestinationPath /; \
-    Start-Process -FilePath msiexec.exe -ArgumentList /i, jenkins.msi, TRANSFORMS=noStart.mst, /qn, /L, jenkins.install.log -PassThru -Wait; \
-    rm \jenkins-%JENKINS_VERSION%.zip; \
-    rm \jenkins.msi; \
-    rm \noStart.mst; \
-    $xml = (Get-Content \"%ProgramFiles(x86)%\Jenkins\Jenkins.xml\") -as [Xml]; \
-    $xml.service.env.value = \"%JENKINS_HOME%\"; \
-    $xml.Save(\"%ProgramFiles(x86)%\Jenkins\Jenkins.xml\");
+RUN `
+    # Install Portable Git
+    [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; `
+    Invoke-WebRequest -UseBasicParsing https://github.com/git-for-windows/git/releases/download/v2.18.0.windows.1/PortableGit-2.18.0-64-bit.7z.exe -OutFile PortableGit-2.18.0-64-bit.7z.exe; `
+    Start-Process -FilePath PortableGit-2.18.0-64-bit.7z.exe -ArgumentList '-y', '-InstallPath="C:\\PortableGit"' -NoNewWindow -PassThru -Wait; `
+    Remove-Item PortableGit-2.18.0-64-bit.7z.exe; `
+    # Set Path
+    setx /M PATH $(${Env:PATH} `
+        + \";C:\PortableGit\bin\"); `
+    Invoke-WebRequest -UseBasicParsing -Uri "https://dotnetbinaries.blob.core.windows.net/servicemonitor/2.0.1.3/ServiceMonitor.exe" -OutFile \ServiceMonitor.exe; `
+    Invoke-WebRequest http://mirrors.jenkins-ci.org/windows-stable/jenkins-$Env:JENKINS_VERSION.zip -OutFile \jenkins-$Env:JENKINS_VERSION.zip; `
+    Expand-Archive -Path \jenkins-$Env:JENKINS_VERSION.zip -DestinationPath /; `
+    Start-Process -FilePath msiexec.exe -ArgumentList /i, jenkins.msi, TRANSFORMS=noStart.mst, /qn, /L, jenkins.install.log -PassThru -Wait -NoNewWindow; `
+    Remove-Item \jenkins-$Env:JENKINS_VERSION.zip; `
+    Remove-Item \jenkins.msi; `
+    Remove-Item \noStart.mst; `
+    $xml = (Get-Content \"${Env:ProgramFiles(x86)}\Jenkins\Jenkins.xml\") -as [Xml]; `
+    $xml.service.env.value = \"$Env:JENKINS_HOME\"; `
+    $xml.Save(\"${Env:ProgramFiles(x86)}\Jenkins\Jenkins.xml\");
+
+EXPOSE 8080 50000
+VOLUME $JENKINS_HOME
 
 ENTRYPOINT ["C:\\ServiceMonitor.exe", "jenkins"]

windowsservercore/nginx/Dockerfile

@@ -1,16 +1,28 @@
+# escape=`
+
 FROM microsoft/windowsservercore:10.0.14393.2312
 LABEL maintainer="xied75@gmail.com"
 
+SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
+
 ENV NGINX_VERSION 1.14.0
 
-RUN setx PATH %PATH%;C:\nginx-%NGINX_VERSION%;
-EXPOSE 80 443
+RUN `
+    Invoke-WebRequest -UseBasicParsing http://nginx.org/download/nginx-$Env:NGINX_VERSION.zip -outfile \nginx-$Env:NGINX_VERSION.zip; `
+    Expand-Archive -Path \nginx-$Env:NGINX_VERSION.zip -DestinationPath /; `
+    Remove-Item /nginx-$Env:NGINX_VERSION.zip; `
+    New-Item -Type Directory \nginx-$Env:NGINX_VERSION\conf\sites-available; `
+    New-Item -Type Directory \nginx-$Env:NGINX_VERSION\conf\sites-enabled; `
+    Rename-Item \nginx-$Env:NGINX_VERSION\conf\nginx.conf nginx.conf.original;
 
-RUN powershell -Command \
-    Invoke-WebRequest http://nginx.org/download/nginx-%NGINX_VERSION%.zip -outfile \nginx-%NGINX_VERSION%.zip; \
-    Expand-Archive -Path \nginx-%NGINX_VERSION%.zip -DestinationPath /; \
-    rm /nginx-%NGINX_VERSION%.zip
+COPY nginx.conf \nginx-$NGINX_VERSION\conf\
+COPY default.conf \nginx-$NGINX_VERSION\conf\sites-enabled\
+
+RUN setx /M PATH $(${Env:PATH} `
+    + \";C:\nginx-${Env:NGINX_VERSION}\");
+
+EXPOSE 80 443
 
 WORKDIR C:/nginx-$NGINX_VERSION
 
-CMD c:/nginx-%NGINX_VERSION%/nginx.exe
+CMD ["nginx.exe"]

windowsservercore/nginx/default.conf

@@ -0,0 +1,9 @@
+server {
+    listen       80;
+    server_name  localhost;
+
+    location / {
+        root   html;
+        index  index.html index.htm;
+    }
+}

windowsservercore/nginx/nginx.conf

@@ -0,0 +1,36 @@
+
+#user  nobody;
+worker_processes  1;
+
+#error_log  logs/error.log;
+#error_log  logs/error.log  notice;
+#error_log  logs/error.log  info;
+
+#pid        logs/nginx.pid;
+
+
+events {
+    worker_connections  1024;
+}
+
+
+http {
+    include       mime.types;
+    default_type  application/octet-stream;
+
+    #log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
+    #                  '$status $body_bytes_sent "$http_referer" '
+    #                  '"$http_user_agent" "$http_x_forwarded_for"';
+
+    #access_log  logs/access.log  main;
+
+    sendfile        on;
+    #tcp_nopush     on;
+
+    #keepalive_timeout  0;
+    keepalive_timeout  65;
+
+    #gzip  on;
+    
+    include     sites-enabled/*.conf;
+}