From e8f060bafa93f8a39d70afc13cca7407043823e9 Mon Sep 17 00:00:00 2001 From: Bo-Yi Wu Date: Sun, 17 Feb 2019 00:02:11 +0800 Subject: [PATCH] refactor: docker --- Dockerfile.alpine | 13 ------------- Dockerfile.arm | 10 ---------- Dockerfile => docker/Dockerfile.linux.amd64 | 4 ++-- Dockerfile.i386 => docker/Dockerfile.linux.arm | 6 +++--- Dockerfile.arm64 => docker/Dockerfile.linux.arm64 | 4 ++-- Dockerfile.windows => docker/Dockerfile.windows | 6 +++--- 6 files changed, 10 insertions(+), 33 deletions(-) delete mode 100644 Dockerfile.alpine delete mode 100644 Dockerfile.arm rename Dockerfile => docker/Dockerfile.linux.amd64 (74%) rename Dockerfile.i386 => docker/Dockerfile.linux.arm (59%) rename Dockerfile.arm64 => docker/Dockerfile.linux.arm64 (74%) rename Dockerfile.windows => docker/Dockerfile.windows (57%) diff --git a/Dockerfile.alpine b/Dockerfile.alpine deleted file mode 100644 index c79d578..0000000 --- a/Dockerfile.alpine +++ /dev/null @@ -1,13 +0,0 @@ -FROM alpine:3.7 - -LABEL maintainer="Bo-Yi Wu " \ - org.label-schema.name="Drone Telegram" \ - org.label-schema.vendor="Bo-Yi Wu" \ - org.label-schema.schema-version="1.0" - -RUN apk add -U --no-cache ca-certificates && \ - rm -rf /var/cache/apk/* - -ADD release/linux/amd64/drone-telegram /bin/ - -ENTRYPOINT ["/bin/drone-telegram"] diff --git a/Dockerfile.arm b/Dockerfile.arm deleted file mode 100644 index 088dd50..0000000 --- a/Dockerfile.arm +++ /dev/null @@ -1,10 +0,0 @@ -FROM plugins/base:multiarch - -LABEL maintainer="Bo-Yi Wu " \ - org.label-schema.name="Drone Telegram" \ - org.label-schema.vendor="Bo-Yi Wu" \ - org.label-schema.schema-version="1.0" - -ADD release/linux/amd64/drone-telegram /bin/ - -ENTRYPOINT ["/bin/drone-telegram"] diff --git a/Dockerfile b/docker/Dockerfile.linux.amd64 similarity index 74% rename from Dockerfile rename to docker/Dockerfile.linux.amd64 index 088dd50..7f08541 100644 --- a/Dockerfile +++ b/docker/Dockerfile.linux.amd64 @@ -1,7 +1,7 @@ -FROM plugins/base:multiarch +FROM plugins/base:linux-amd64 LABEL maintainer="Bo-Yi Wu " \ - org.label-schema.name="Drone Telegram" \ + org.label-schema.name="Drone telegram" \ org.label-schema.vendor="Bo-Yi Wu" \ org.label-schema.schema-version="1.0" diff --git a/Dockerfile.i386 b/docker/Dockerfile.linux.arm similarity index 59% rename from Dockerfile.i386 rename to docker/Dockerfile.linux.arm index fd4ec45..ce0d095 100644 --- a/Dockerfile.i386 +++ b/docker/Dockerfile.linux.arm @@ -1,10 +1,10 @@ -FROM plugins/base:multiarch +FROM plugins/base:linux-arm LABEL maintainer="Bo-Yi Wu " \ - org.label-schema.name="Drone Telegram" \ + org.label-schema.name="Drone telegram" \ org.label-schema.vendor="Bo-Yi Wu" \ org.label-schema.schema-version="1.0" -ADD release/linux/i386/drone-telegram /bin/ +ADD release/linux/arm/drone-telegram /bin/ ENTRYPOINT ["/bin/drone-telegram"] diff --git a/Dockerfile.arm64 b/docker/Dockerfile.linux.arm64 similarity index 74% rename from Dockerfile.arm64 rename to docker/Dockerfile.linux.arm64 index 5ef9246..e9441b3 100644 --- a/Dockerfile.arm64 +++ b/docker/Dockerfile.linux.arm64 @@ -1,7 +1,7 @@ -FROM plugins/base:multiarch +FROM plugins/base:linux-arm64 LABEL maintainer="Bo-Yi Wu " \ - org.label-schema.name="Drone Telegram" \ + org.label-schema.name="Drone telegram" \ org.label-schema.vendor="Bo-Yi Wu" \ org.label-schema.schema-version="1.0" diff --git a/Dockerfile.windows b/docker/Dockerfile.windows similarity index 57% rename from Dockerfile.windows rename to docker/Dockerfile.windows index 965ffd5..ad4bb23 100644 --- a/Dockerfile.windows +++ b/docker/Dockerfile.windows @@ -1,9 +1,9 @@ -FROM microsoft/nanoserver:10.0.14393.1884 +FROM plugins/base:windows-amd64 LABEL maintainer="Bo-Yi Wu " \ - org.label-schema.name="Drone Telegram" \ + org.label-schema.name="Drone telegram" \ org.label-schema.vendor="Bo-Yi Wu" \ org.label-schema.schema-version="1.0" -ADD drone-telegram.exe /drone-telegram.exe +ADD release/drone-telegram.exe /drone-telegram.exe ENTRYPOINT [ "\\drone-telegram.exe" ]