From c93974e14a9beed42587b504493424881a3b1d08 Mon Sep 17 00:00:00 2001 From: Don Date: Wed, 18 Dec 2019 15:58:18 -0800 Subject: [PATCH] Update Dockerfiles from boilr template --- docker/Dockerfile.linux.amd64 | 2 +- docker/Dockerfile.windows.1809 | 8 +++----- ...kerfile.windows.1803 => Dockerfile.windows.1903} | 8 +++----- docker/Dockerfile.windows.1909 | 10 ++++++++++ docker/manifest.tmpl | 13 +------------ 5 files changed, 18 insertions(+), 23 deletions(-) rename docker/{Dockerfile.windows.1803 => Dockerfile.windows.1903} (59%) create mode 100644 docker/Dockerfile.windows.1909 diff --git a/docker/Dockerfile.linux.amd64 b/docker/Dockerfile.linux.amd64 index aa5ed04..087df83 100644 --- a/docker/Dockerfile.linux.amd64 +++ b/docker/Dockerfile.linux.amd64 @@ -8,4 +8,4 @@ LABEL maintainer="Drone.IO Community " \ RUN apk add --no-cache git nodejs nodejs-npm ADD release/linux/amd64/drone-npm /bin/ -ENTRYPOINT ["/bin/drone-npm"] +ENTRYPOINT [ "/bin/drone-npm" ] diff --git a/docker/Dockerfile.windows.1809 b/docker/Dockerfile.windows.1809 index 9adbafb..3df5be9 100644 --- a/docker/Dockerfile.windows.1809 +++ b/docker/Dockerfile.windows.1809 @@ -1,12 +1,10 @@ # escape=` -FROM plugins/base:windows-1809 +FROM plugins/base:windows-1809-amd64 LABEL maintainer="Drone.IO Community " ` org.label-schema.name="Drone NPM" ` org.label-schema.vendor="Drone.IO Community" ` org.label-schema.schema-version="1.0" -# TODO: install required tools - -ADD release\drone-npm.exe c:\drone-npm.exe -ENTRYPOINT [ "c:\\drone-npm.exe" ] +ADD release/windows/amd64/drone-npm.exe C:/bin/drone-npm.exe +ENTRYPOINT [ "C:\\bin\\drone-npm.exe" ] diff --git a/docker/Dockerfile.windows.1803 b/docker/Dockerfile.windows.1903 similarity index 59% rename from docker/Dockerfile.windows.1803 rename to docker/Dockerfile.windows.1903 index a2d7432..01a83e9 100644 --- a/docker/Dockerfile.windows.1803 +++ b/docker/Dockerfile.windows.1903 @@ -1,12 +1,10 @@ # escape=` -FROM plugins/base:windows-1803 +FROM plugins/base:windows-1903-amd64 LABEL maintainer="Drone.IO Community " ` org.label-schema.name="Drone NPM" ` org.label-schema.vendor="Drone.IO Community" ` org.label-schema.schema-version="1.0" -# TODO: install required tools - -ADD release\drone-npm.exe c:\drone-npm.exe -ENTRYPOINT [ "c:\\drone-npm.exe" ] +ADD release/windows/amd64/drone-npm.exe C:/bin/drone-npm.exe +ENTRYPOINT [ "C:\\bin\\drone-npm.exe" ] diff --git a/docker/Dockerfile.windows.1909 b/docker/Dockerfile.windows.1909 new file mode 100644 index 0000000..4559030 --- /dev/null +++ b/docker/Dockerfile.windows.1909 @@ -0,0 +1,10 @@ +# escape=` +FROM plugins/base:windows-1909-amd64 + +LABEL maintainer="Drone.IO Community " ` + org.label-schema.name="Drone NPM" ` + org.label-schema.vendor="Drone.IO Community" ` + org.label-schema.schema-version="1.0" + +ADD release/windows/amd64/drone-npm.exe C:/bin/drone-npm.exe +ENTRYPOINT [ "C:\\bin\\drone-npm.exe" ] diff --git a/docker/manifest.tmpl b/docker/manifest.tmpl index 69b847b..2d724c2 100644 --- a/docker/manifest.tmpl +++ b/docker/manifest.tmpl @@ -23,15 +23,4 @@ manifests: architecture: arm os: linux variant: v7 - - - image: plugins/npm:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}windows-1803 - platform: - architecture: amd64 - os: windows - version: 1803 - - - image: plugins/npm:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}windows-1809 - platform: - architecture: amd64 - os: windows - version: 1809 +