Update windows dockerfiles and add 1809 versions

This commit is contained in:
Don 2019-03-14 12:26:51 -07:00
parent 52b1d92c3d
commit 9cff2bcbd3
6 changed files with 36 additions and 12 deletions

View file

@ -1,4 +1,4 @@
FROM microsoft/nanoserver:1803
FROM mcr.microsoft.com/windows/nanoserver:1803
USER ContainerAdministrator
ENV GODEBUG=netdns=go
@ -8,5 +8,5 @@ ENV DRONE_RUNNER_PLATFORM=windows/amd64
ENV DRONE_RUNNER_KERNEL=1803
ENV DRONE_RUNNER_CAPACITY=1
ADD release/windows/amd64/drone-agent.exe /drone-agent.exe
ENTRYPOINT [ "\\drone-agent.exe" ]
ADD release/windows/amd64/drone-agent.exe C:/drone-agent.exe
ENTRYPOINT [ "C:\\drone-agent.exe" ]

View file

@ -1,12 +1,12 @@
FROM microsoft/nanoserver:1709
FROM mcr.microsoft.com/windows/nanoserver:1809
USER ContainerAdministrator
ENV GODEBUG=netdns=go
ENV DRONE_RUNNER_OS=windows
ENV DRONE_RUNNER_ARCH=amd64
ENV DRONE_RUNNER_PLATFORM=windows/amd64
ENV DRONE_RUNNER_KERNEL=1709
ENV DRONE_RUNNER_KERNEL=1809
ENV DRONE_RUNNER_CAPACITY=1
ADD release/windows/amd64/drone-agent.exe /drone-agent.exe
ENTRYPOINT [ "\\drone-agent.exe" ]
ADD release/windows/amd64/drone-agent.exe C:/drone-agent.exe
ENTRYPOINT [ "C:\\drone-agent.exe" ]

View file

@ -1,4 +1,4 @@
FROM microsoft/nanoserver:1803
FROM mcr.microsoft.com/windows/nanoserver:1803
USER ContainerAdministrator
ENV GODEBUG=netdns=go
@ -8,5 +8,5 @@ ENV DRONE_RUNNER_PLATFORM=windows/amd64
ENV DRONE_RUNNER_KERNEL=1803
ENV DRONE_RUNNER_CAPACITY=1
ADD release/windows/amd64/drone-controller.exe /drone-controller.exe
ENTRYPOINT [ "\\drone-controller.exe" ]
ADD release/windows/amd64/drone-controller.exe C:/drone-controller.exe
ENTRYPOINT [ "C:\\drone-controller.exe" ]

View file

@ -0,0 +1,12 @@
FROM mcr.microsoft.com/windows/nanoserver:1809
USER ContainerAdministrator
ENV GODEBUG=netdns=go
ENV DRONE_RUNNER_OS=windows
ENV DRONE_RUNNER_ARCH=amd64
ENV DRONE_RUNNER_PLATFORM=windows/amd64
ENV DRONE_RUNNER_KERNEL=1809
ENV DRONE_RUNNER_CAPACITY=1
ADD release/windows/amd64/drone-controller.exe C:/drone-controller.exe
ENTRYPOINT [ "C:\\drone-controller.exe" ]

View file

@ -24,7 +24,13 @@ manifests:
os: linux
variant: v7
-
image: drone/agent:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}windows-amd64
image: drone/agent:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}windows-1803
platform:
architecture: amd64
os: windows
variant: 1803
-
image: drone/agent:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}windows-1809
platform:
architecture: amd64
os: windows

View file

@ -24,8 +24,14 @@ manifests:
os: linux
variant: v7
-
image: drone/controller:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}windows-amd64
image: drone/controller:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}windows-1803
platform:
architecture: amd64
os: windows
variant: 1803
-
image: drone/controller:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}windows-1809
platform:
architecture: amd64
os: windows
variant: 1809