From c569315ae95f226eae1ad11e3aba50481cad86a7 Mon Sep 17 00:00:00 2001 From: Don Date: Thu, 24 Jan 2019 18:03:01 -0800 Subject: [PATCH 1/2] Add Windows Dockerfiles --- ...ockerfile.windows.amd64 => Dockerfile.windows.1803} | 6 +++--- docker/Dockerfile.windows.1809 | 10 ++++++++++ docker/manifest.tmpl | 9 ++++++++- 3 files changed, 21 insertions(+), 4 deletions(-) rename docker/{Dockerfile.windows.amd64 => Dockerfile.windows.1803} (59%) create mode 100644 docker/Dockerfile.windows.1809 diff --git a/docker/Dockerfile.windows.amd64 b/docker/Dockerfile.windows.1803 similarity index 59% rename from docker/Dockerfile.windows.amd64 rename to docker/Dockerfile.windows.1803 index 0d5e9ca..64d6696 100644 --- a/docker/Dockerfile.windows.amd64 +++ b/docker/Dockerfile.windows.1803 @@ -1,10 +1,10 @@ # escape=` -FROM plugins/base:windows-amd64 +FROM plugins/base:windows-1803 LABEL maintainer="Drone.IO Community " ` org.label-schema.name="Drone Webhook" ` org.label-schema.vendor="Drone.IO Community" ` org.label-schema.schema-version="1.0" -ADD release\drone-webhook.exe c:\drone-webhook.exe -ENTRYPOINT [ "c:\\drone-webhook.exe" ] +ADD release/windows/amd64/drone-webhook.exe c:/bin/drone-webhook.exe +ENTRYPOINT [ "C:\\bin\\drone-webhook.exe" ] diff --git a/docker/Dockerfile.windows.1809 b/docker/Dockerfile.windows.1809 new file mode 100644 index 0000000..4930247 --- /dev/null +++ b/docker/Dockerfile.windows.1809 @@ -0,0 +1,10 @@ +# escape=` +FROM plugins/base:windows-1809 + +LABEL maintainer="Drone.IO Community " ` + org.label-schema.name="Drone Webhook" ` + org.label-schema.vendor="Drone.IO Community" ` + org.label-schema.schema-version="1.0" + +ADD release/windows/amd64/drone-webhook.exe c:/bin/drone-webhook.exe +ENTRYPOINT [ "C:\\bin\\drone-webhook.exe" ] diff --git a/docker/manifest.tmpl b/docker/manifest.tmpl index 7caf03b..912e788 100644 --- a/docker/manifest.tmpl +++ b/docker/manifest.tmpl @@ -27,7 +27,14 @@ manifests: architecture: arm os: linux - - image: plugins/webhook:{{#if build.tag}}{{trimPrefix build.tag "v"}}-{{/if}}windows-amd64 + image: plugins/webhook:{{#if build.tag}}{{trimPrefix build.tag "v"}}-{{/if}}windows-1803 platform: architecture: amd64 os: windows + version: 1803 + - + image: plugins/webhook:{{#if build.tag}}{{trimPrefix build.tag "v"}}-{{/if}}windows-1809 + platform: + architecture: amd64 + os: windows + version: 1809 From 6bf18697c6ee404e151b0c2b953296e109c2258d Mon Sep 17 00:00:00 2001 From: Don Date: Fri, 25 Jan 2019 09:48:58 -0800 Subject: [PATCH 2/2] Use drive letters consistently --- docker/Dockerfile.windows.1803 | 2 +- docker/Dockerfile.windows.1809 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/Dockerfile.windows.1803 b/docker/Dockerfile.windows.1803 index 64d6696..cc85e51 100644 --- a/docker/Dockerfile.windows.1803 +++ b/docker/Dockerfile.windows.1803 @@ -6,5 +6,5 @@ LABEL maintainer="Drone.IO Community " ` org.label-schema.vendor="Drone.IO Community" ` org.label-schema.schema-version="1.0" -ADD release/windows/amd64/drone-webhook.exe c:/bin/drone-webhook.exe +ADD release/windows/amd64/drone-webhook.exe C:/bin/drone-webhook.exe ENTRYPOINT [ "C:\\bin\\drone-webhook.exe" ] diff --git a/docker/Dockerfile.windows.1809 b/docker/Dockerfile.windows.1809 index 4930247..f5d91c0 100644 --- a/docker/Dockerfile.windows.1809 +++ b/docker/Dockerfile.windows.1809 @@ -6,5 +6,5 @@ LABEL maintainer="Drone.IO Community " ` org.label-schema.vendor="Drone.IO Community" ` org.label-schema.schema-version="1.0" -ADD release/windows/amd64/drone-webhook.exe c:/bin/drone-webhook.exe +ADD release/windows/amd64/drone-webhook.exe C:/bin/drone-webhook.exe ENTRYPOINT [ "C:\\bin\\drone-webhook.exe" ]