From e83d902cbf68228f01baba13b721477e881dd5c9 Mon Sep 17 00:00:00 2001 From: Thomas Boerger Date: Sun, 20 Jan 2019 20:45:30 +0100 Subject: [PATCH] Move dockerfiles to docker folder --- Dockerfile.i386 | 11 ----------- Dockerfile => docker/Dockerfile.linux.amd64 | 2 +- Dockerfile.arm => docker/Dockerfile.linux.arm | 2 +- Dockerfile.arm64 => docker/Dockerfile.linux.arm64 | 2 +- Dockerfile.windows => docker/Dockerfile.windows.amd64 | 4 +--- 5 files changed, 4 insertions(+), 17 deletions(-) delete mode 100644 Dockerfile.i386 rename Dockerfile => docker/Dockerfile.linux.amd64 (91%) rename Dockerfile.arm => docker/Dockerfile.linux.arm (91%) rename Dockerfile.arm64 => docker/Dockerfile.linux.arm64 (91%) rename Dockerfile.windows => docker/Dockerfile.windows.amd64 (67%) diff --git a/Dockerfile.i386 b/Dockerfile.i386 deleted file mode 100644 index cf58776..0000000 --- a/Dockerfile.i386 +++ /dev/null @@ -1,11 +0,0 @@ -FROM plugins/base:multiarch - -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" - -RUN apk add --no-cache git nodejs nodejs-npm - -ADD release/linux/i386/drone-npm /bin/ -ENTRYPOINT ["/bin/drone-npm"] diff --git a/Dockerfile b/docker/Dockerfile.linux.amd64 similarity index 91% rename from Dockerfile rename to docker/Dockerfile.linux.amd64 index 059670d..aa5ed04 100644 --- a/Dockerfile +++ b/docker/Dockerfile.linux.amd64 @@ -1,4 +1,4 @@ -FROM plugins/base:amd64 +FROM plugins/base:linux-amd64 LABEL maintainer="Drone.IO Community " \ org.label-schema.name="Drone NPM" \ diff --git a/Dockerfile.arm b/docker/Dockerfile.linux.arm similarity index 91% rename from Dockerfile.arm rename to docker/Dockerfile.linux.arm index bec685a..8494e75 100644 --- a/Dockerfile.arm +++ b/docker/Dockerfile.linux.arm @@ -1,4 +1,4 @@ -FROM plugins/base:arm +FROM plugins/base:linux-arm LABEL maintainer="Drone.IO Community " \ org.label-schema.name="Drone NPM" \ diff --git a/Dockerfile.arm64 b/docker/Dockerfile.linux.arm64 similarity index 91% rename from Dockerfile.arm64 rename to docker/Dockerfile.linux.arm64 index 709329f..9306c28 100644 --- a/Dockerfile.arm64 +++ b/docker/Dockerfile.linux.arm64 @@ -1,4 +1,4 @@ -FROM plugins/base:arm64 +FROM plugins/base:linux-arm64 LABEL maintainer="Drone.IO Community " \ org.label-schema.name="Drone NPM" \ diff --git a/Dockerfile.windows b/docker/Dockerfile.windows.amd64 similarity index 67% rename from Dockerfile.windows rename to docker/Dockerfile.windows.amd64 index 0862e7f..698845c 100644 --- a/Dockerfile.windows +++ b/docker/Dockerfile.windows.amd64 @@ -1,13 +1,11 @@ # escape=` -FROM microsoft/nanoserver:10.0.14393.1593 +FROM plugins/base:windows-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" -SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] - # TODO: install required tools ADD release\drone-npm.exe c:\drone-npm.exe