From b193f2e575baa9764c2e94ade66a92b2da3c37d6 Mon Sep 17 00:00:00 2001 From: Thomas Boerger Date: Sun, 20 Jan 2019 20:45:31 +0100 Subject: [PATCH] Move dockerfiles to docker folder --- Dockerfile.i386 | 18 ------------------ Dockerfile => docker/Dockerfile.linux.amd64 | 3 +-- Dockerfile.arm => docker/Dockerfile.linux.arm | 3 +-- .../Dockerfile.linux.arm64 | 3 +-- docker/Dockerfile.windows.amd64 | 12 ++++++++++++ 5 files changed, 15 insertions(+), 24 deletions(-) delete mode 100644 Dockerfile.i386 rename Dockerfile => docker/Dockerfile.linux.amd64 (95%) rename Dockerfile.arm => docker/Dockerfile.linux.arm (95%) rename Dockerfile.arm64 => docker/Dockerfile.linux.arm64 (95%) create mode 100644 docker/Dockerfile.windows.amd64 diff --git a/Dockerfile.i386 b/Dockerfile.i386 deleted file mode 100644 index 5797b05..0000000 --- a/Dockerfile.i386 +++ /dev/null @@ -1,18 +0,0 @@ -FROM plugins/base:arm64 - -LABEL maintainer="Drone.IO Community " \ - org.label-schema.name="Drone Hugo" \ - org.label-schema.vendor="Drone.IO Community" \ - org.label-schema.schema-version="1.0" - -ENV HUGO_VERSION=0.46 -ENV HUGO_ARCH=32bit -ENV PLUGIN_HUGO_ARCH=$HUGO_ARCH -ENV PLUGIN_HUGO_SHIPPED_VERSION=$HUGO_VERSION - -RUN apk --no-cache add git && \ - wget -O- https://github.com/gohugoio/hugo/releases/download/v${HUGO_VERSION}/hugo_${HUGO_VERSION}_Linux-${HUGO_ARCH}.tar.gz | tar xz -C /bin - -ADD release/linux/i386/drone-hugo /bin/ - -ENTRYPOINT ["/bin/drone-hugo"] diff --git a/Dockerfile b/docker/Dockerfile.linux.amd64 similarity index 95% rename from Dockerfile rename to docker/Dockerfile.linux.amd64 index bb47439..885f479 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 Hugo" \ @@ -14,5 +14,4 @@ RUN apk --no-cache add git && \ wget -O- https://github.com/gohugoio/hugo/releases/download/v${HUGO_VERSION}/hugo_${HUGO_VERSION}_Linux-${HUGO_ARCH}.tar.gz | tar xz -C /bin ADD release/linux/amd64/drone-hugo /bin/ - ENTRYPOINT ["/bin/drone-hugo"] diff --git a/Dockerfile.arm b/docker/Dockerfile.linux.arm similarity index 95% rename from Dockerfile.arm rename to docker/Dockerfile.linux.arm index 1862850..1bfe587 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 Hugo" \ @@ -14,5 +14,4 @@ RUN apk --no-cache add git && \ wget -O- https://github.com/gohugoio/hugo/releases/download/v${HUGO_VERSION}/hugo_${HUGO_VERSION}_Linux-${HUGO_ARCH}.tar.gz | tar xz -C /bin ADD release/linux/arm/drone-hugo /bin/ - ENTRYPOINT ["/bin/drone-hugo"] diff --git a/Dockerfile.arm64 b/docker/Dockerfile.linux.arm64 similarity index 95% rename from Dockerfile.arm64 rename to docker/Dockerfile.linux.arm64 index 27a3b3d..ec0d40e 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 Hugo" \ @@ -14,5 +14,4 @@ RUN apk --no-cache add git && \ wget -O- https://github.com/gohugoio/hugo/releases/download/v${HUGO_VERSION}/hugo_${HUGO_VERSION}_Linux-${HUGO_ARCH}.tar.gz | tar xz -C /bin ADD release/linux/arm64/drone-hugo /bin/ - ENTRYPOINT ["/bin/drone-hugo"] diff --git a/docker/Dockerfile.windows.amd64 b/docker/Dockerfile.windows.amd64 new file mode 100644 index 0000000..ed826eb --- /dev/null +++ b/docker/Dockerfile.windows.amd64 @@ -0,0 +1,12 @@ +# escape=` +FROM plugins/base:windows-amd64 + +LABEL maintainer="Drone.IO Community " ` + org.label-schema.name="Drone Mercurial" ` + org.label-schema.vendor="Drone.IO Community" ` + org.label-schema.schema-version="1.0" + +# TODO: install required tools + +ADD release\drone-hugo.exe c:\drone-hugo.exe +ENTRYPOINT [ "c:\\drone-hugo.exe" ]