diff --git a/Dockerfile.i386 b/Dockerfile.i386 deleted file mode 100644 index e0306c4..0000000 --- a/Dockerfile.i386 +++ /dev/null @@ -1,12 +0,0 @@ -FROM plugins/base:i386 - -LABEL maintainer="Drone.IO Community " \ - org.label-schema.name="Drone Ansible" \ - org.label-schema.vendor="Drone.IO Community" \ - org.label-schema.schema-version="1.0" - -RUN apk add --no-cache bash git curl rysnc openssh-client ansible py-pip && \ - pip install -U pip - -ADD release/linux/i386/drone-ansible /bin/ -ENTRYPOINT ["/bin/drone-ansible"] diff --git a/Dockerfile b/docker/Dockerfile.linux.amd64 similarity index 94% rename from Dockerfile rename to docker/Dockerfile.linux.amd64 index d623a02..056a067 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 Ansible" \ diff --git a/Dockerfile.arm b/docker/Dockerfile.linux.arm similarity index 93% rename from Dockerfile.arm rename to docker/Dockerfile.linux.arm index 4e8c2d4..f51fa75 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 Ansible" \ diff --git a/Dockerfile.arm64 b/docker/Dockerfile.linux.arm64 similarity index 92% rename from Dockerfile.arm64 rename to docker/Dockerfile.linux.arm64 index b1e9139..6c688e9 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 Ansible" \ diff --git a/Dockerfile.windows b/docker/Dockerfile.windows.amd64 similarity index 68% rename from Dockerfile.windows rename to docker/Dockerfile.windows.amd64 index 79040e9..fb01d66 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 Ansible" ` 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-ansible.exe c:\drone-ansible.exe