diff --git a/.github/settings.yml b/.github/settings.yml index f647429..c13e4b0 100644 --- a/.github/settings.yml +++ b/.github/settings.yml @@ -1,7 +1,7 @@ repository: - name: drone-docker + name: kaniko-docker description: Drone plugin for publishing Docker images - homepage: http://plugins.drone.io/drone-plugins/drone-docker + homepage: http://plugins.drone.io/drone-plugins/drone-kaniko topics: drone, drone-plugin private: false diff --git a/README.md b/README.md index 2433bcb..d557cd0 100644 --- a/README.md +++ b/README.md @@ -1,14 +1,6 @@ -# drone-docker +# drone-kaniko -[![Build Status](http://cloud.drone.io/api/badges/drone-plugins/drone-docker/status.svg)](http://cloud.drone.io/drone-plugins/drone-docker) -[![Gitter chat](https://badges.gitter.im/drone/drone.png)](https://gitter.im/drone/drone) -[![Join the discussion at https://discourse.drone.io](https://img.shields.io/badge/discourse-forum-orange.svg)](https://discourse.drone.io) -[![Drone questions at https://stackoverflow.com](https://img.shields.io/badge/drone-stackoverflow-orange.svg)](https://stackoverflow.com/questions/tagged/drone.io) -[![](https://images.microbadger.com/badges/image/plugins/docker.svg)](https://microbadger.com/images/plugins/docker "Get your own image badge on microbadger.com") -[![Go Doc](https://godoc.org/github.com/drone-plugins/drone-docker?status.svg)](http://godoc.org/github.com/drone-plugins/drone-docker) -[![Go Report](https://goreportcard.com/badge/github.com/drone-plugins/drone-docker)](https://goreportcard.com/report/github.com/drone-plugins/drone-docker) - -Drone plugin uses Docker-in-Docker to build and publish Docker images to a container registry. For the usage information and a listing of the available options please take a look at [the docs](http://plugins.drone.io/drone-plugins/drone-docker/). +Drone kaniko plugin uses [kaniko](https://github.com/GoogleContainerTools/kaniko) to build and publish Docker images to a container registry. ## Build @@ -20,11 +12,9 @@ export GOARCH=amd64 export CGO_ENABLED=0 export GO111MODULE=on -go build -v -a -tags netgo -o release/linux/amd64/drone-docker ./cmd/drone-docker -go build -v -a -tags netgo -o release/linux/amd64/drone-gcr ./cmd/drone-gcr -go build -v -a -tags netgo -o release/linux/amd64/drone-ecr ./cmd/drone-ecr -go build -v -a -tags netgo -o release/linux/amd64/drone-acr ./cmd/drone-acr -go build -v -a -tags netgo -o release/linux/amd64/drone-heroku ./cmd/drone-heroku +go build -v -a -tags netgo -o release/linux/amd64/kaniko-docker ./cmd/kaniko-docker +go build -v -a -tags netgo -o release/linux/amd64/kaniko-gcr ./cmd/kaniko-gcr +go build -v -a -tags netgo -o release/linux/amd64/kaniko-ecr ./cmd/kaniko-ecr ``` ## Docker @@ -35,27 +25,17 @@ Build the Docker images with the following commands: docker build \ --label org.label-schema.build-date=$(date -u +"%Y-%m-%dT%H:%M:%SZ") \ --label org.label-schema.vcs-ref=$(git rev-parse --short HEAD) \ - --file docker/docker/Dockerfile.linux.amd64 --tag plugins/docker . + --file docker/docker/Dockerfile.linux.amd64 --tag plugins/kaniko-docker . docker build \ --label org.label-schema.build-date=$(date -u +"%Y-%m-%dT%H:%M:%SZ") \ --label org.label-schema.vcs-ref=$(git rev-parse --short HEAD) \ - --file docker/gcr/Dockerfile.linux.amd64 --tag plugins/gcr . + --file docker/gcr/Dockerfile.linux.amd64 --tag plugins/kaniko-gcr . docker build \ --label org.label-schema.build-date=$(date -u +"%Y-%m-%dT%H:%M:%SZ") \ --label org.label-schema.vcs-ref=$(git rev-parse --short HEAD) \ - --file docker/ecr/Dockerfile.linux.amd64 --tag plugins/ecr . - -docker build \ - --label org.label-schema.build-date=$(date -u +"%Y-%m-%dT%H:%M:%SZ") \ - --label org.label-schema.vcs-ref=$(git rev-parse --short HEAD) \ - --file docker/acr/Dockerfile.linux.amd64 --tag plugins/acr . - -docker build \ - --label org.label-schema.build-date=$(date -u +"%Y-%m-%dT%H:%M:%SZ") \ - --label org.label-schema.vcs-ref=$(git rev-parse --short HEAD) \ - --file docker/heroku/Dockerfile.linux.amd64 --tag plugins/heroku . + --file docker/ecr/Dockerfile.linux.amd64 --tag plugins/kaniko-ecr . ``` ## Usage @@ -66,9 +46,7 @@ docker build \ docker run --rm \ -e PLUGIN_TAG=latest \ -e PLUGIN_REPO=octocat/hello-world \ - -e DRONE_COMMIT_SHA=d8dbe4d94f15fe89232e0402c6e8a0ddf21af3ab \ -v $(pwd):$(pwd) \ -w $(pwd) \ - --privileged \ - plugins/docker --dry-run + plugins/kaniko-docker ``` diff --git a/cmd/drone-docker/main.go b/cmd/kaniko-docker/main.go similarity index 96% rename from cmd/drone-docker/main.go rename to cmd/kaniko-docker/main.go index c186e2c..d675d87 100644 --- a/cmd/drone-docker/main.go +++ b/cmd/kaniko-docker/main.go @@ -11,7 +11,7 @@ import ( "github.com/sirupsen/logrus" "github.com/urfave/cli" - docker "github.com/drone-plugins/drone-docker" + kaniko "github.com/drone/drone-kaniko" ) const ( @@ -103,8 +103,8 @@ func run(c *cli.Context) error { return err } - plugin := docker.Plugin{ - Build: docker.Build{ + plugin := kaniko.Plugin{ + Build: kaniko.Build{ Dockerfile: c.String("dockerfile"), Context: c.String("context"), Tags: c.StringSlice("tags"), diff --git a/docker/docker/Dockerfile.linux.amd64 b/docker/docker/Dockerfile.linux.amd64 index e66211a..0cd40aa 100644 --- a/docker/docker/Dockerfile.linux.amd64 +++ b/docker/docker/Dockerfile.linux.amd64 @@ -3,5 +3,5 @@ FROM gcr.io/kaniko-project/executor:debug-v0.19.0 ENV HOME /root ENV USER root -ADD release/linux/amd64/drone-docker /kaniko/ -ENTRYPOINT ["/kaniko/drone-docker"] +ADD release/linux/amd64/kaniko-docker /kaniko/ +ENTRYPOINT ["/kaniko/kaniko-docker"] diff --git a/docker/docker/Dockerfile.linux.arm b/docker/docker/Dockerfile.linux.arm deleted file mode 100644 index 1a8d8b3..0000000 --- a/docker/docker/Dockerfile.linux.arm +++ /dev/null @@ -1,6 +0,0 @@ -FROM arm32v6/docker:19.03.8-dind - -ENV DOCKER_HOST=unix:///var/run/docker.sock - -ADD release/linux/arm/drone-docker /bin/ -ENTRYPOINT ["/usr/local/bin/dockerd-entrypoint.sh", "/bin/drone-docker"] diff --git a/docker/docker/Dockerfile.linux.arm64 b/docker/docker/Dockerfile.linux.arm64 deleted file mode 100644 index 2a70c6a..0000000 --- a/docker/docker/Dockerfile.linux.arm64 +++ /dev/null @@ -1,6 +0,0 @@ -FROM arm64v8/docker:19.03.8-dind - -ENV DOCKER_HOST=unix:///var/run/docker.sock - -ADD release/linux/arm64/drone-docker /bin/ -ENTRYPOINT ["/usr/local/bin/dockerd-entrypoint.sh", "/bin/drone-docker"] diff --git a/docker/docker/Dockerfile.windows.1803 b/docker/docker/Dockerfile.windows.1803 deleted file mode 100644 index 41352d7..0000000 --- a/docker/docker/Dockerfile.windows.1803 +++ /dev/null @@ -1,26 +0,0 @@ -# escape=` -FROM mcr.microsoft.com/windows/servercore:1803 as download - -SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] - -ENV DOCKER_VERSION 18.09.1 - -RUN Invoke-WebRequest 'http://constexpr.org/innoextract/files/innoextract-1.6-windows.zip' -OutFile 'innoextract.zip' -UseBasicParsing ; ` - Expand-Archive innoextract.zip -DestinationPath C:\ ; ` - Remove-Item -Path innoextract.zip - -RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 ; ` - Invoke-WebRequest $('https://github.com/docker/toolbox/releases/download/v{0}/DockerToolbox-{0}.exe' -f $env:DOCKER_VERSION) -OutFile 'dockertoolbox.exe' -UseBasicParsing -RUN /innoextract.exe dockertoolbox.exe - -FROM plugins/base:windows-1803 - -LABEL maintainer="Drone.IO Community " ` - org.label-schema.name="Drone Docker" ` - org.label-schema.vendor="Drone.IO Community" ` - org.label-schema.schema-version="1.0" - -COPY --from=download /windows/system32/netapi32.dll /windows/system32/netapi32.dll -COPY --from=download /app/docker.exe C:/bin/docker.exe -ADD release/windows/amd64/drone-docker.exe C:/bin/drone-docker.exe -ENTRYPOINT [ "C:\\bin\\drone-docker.exe" ] diff --git a/docker/docker/Dockerfile.windows.1809 b/docker/docker/Dockerfile.windows.1809 deleted file mode 100644 index bffc4b4..0000000 --- a/docker/docker/Dockerfile.windows.1809 +++ /dev/null @@ -1,27 +0,0 @@ -# escape=` -FROM mcr.microsoft.com/windows/servercore:1809 as download - -SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] - -ENV DOCKER_VERSION 18.09.1 - -RUN Invoke-WebRequest 'http://constexpr.org/innoextract/files/innoextract-1.6-windows.zip' -OutFile 'innoextract.zip' -UseBasicParsing ; ` - Expand-Archive innoextract.zip -DestinationPath C:\ ; ` - Remove-Item -Path innoextract.zip - -RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 ; ` - Invoke-WebRequest $('https://github.com/docker/toolbox/releases/download/v{0}/DockerToolbox-{0}.exe' -f $env:DOCKER_VERSION) -OutFile 'dockertoolbox.exe' -UseBasicParsing -RUN /innoextract.exe dockertoolbox.exe - -FROM mcr.microsoft.com/windows/nanoserver:1809 -USER ContainerAdministrator - -LABEL maintainer="Drone.IO Community " ` - org.label-schema.name="Drone Docker" ` - org.label-schema.vendor="Drone.IO Community" ` - org.label-schema.schema-version="1.0" - -COPY --from=download /windows/system32/netapi32.dll /windows/system32/netapi32.dll -COPY --from=download /app/docker.exe C:/bin/docker.exe -ADD release/windows/amd64/drone-docker.exe C:/bin/drone-docker.exe -ENTRYPOINT [ "C:\\bin\\drone-docker.exe" ] diff --git a/docker/docker/Dockerfile.windows.1903 b/docker/docker/Dockerfile.windows.1903 deleted file mode 100644 index a6eadef..0000000 --- a/docker/docker/Dockerfile.windows.1903 +++ /dev/null @@ -1,28 +0,0 @@ -# escape=` -FROM mcr.microsoft.com/windows/servercore:1903 as download - -SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] - -ENV DOCKER_VERSION 19.03.1 - -RUN Invoke-WebRequest 'http://constexpr.org/innoextract/files/innoextract-1.7-windows.zip' -OutFile 'innoextract.zip' -UseBasicParsing ; ` - Expand-Archive innoextract.zip -DestinationPath C:\ ; ` - Remove-Item -Path innoextract.zip - -RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 ; ` - Invoke-WebRequest $('https://github.com/docker/toolbox/releases/download/v{0}/DockerToolbox-{0}.exe' -f $env:DOCKER_VERSION) -OutFile 'dockertoolbox.exe' -UseBasicParsing -RUN /innoextract.exe dockertoolbox.exe - -FROM mcr.microsoft.com/windows/nanoserver:1903 -USER ContainerAdministrator - -LABEL maintainer="Drone.IO Community " ` - org.label-schema.name="Drone Docker" ` - org.label-schema.vendor="Drone.IO Community" ` - org.label-schema.schema-version="1.0" - -RUN mkdir C:\bin -COPY --from=download /windows/system32/netapi32.dll /windows/system32/netapi32.dll -COPY --from=download /app/docker.exe C:/bin/docker.exe -ADD release/windows/amd64/drone-docker.exe C:/bin/drone-docker.exe -ENTRYPOINT [ "C:\\bin\\drone-docker.exe" ] diff --git a/docker/docker/Dockerfile.windows.1909 b/docker/docker/Dockerfile.windows.1909 deleted file mode 100644 index e8dc3ae..0000000 --- a/docker/docker/Dockerfile.windows.1909 +++ /dev/null @@ -1,28 +0,0 @@ -# escape=` -FROM mcr.microsoft.com/windows/servercore:1909 as download - -SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] - -ENV DOCKER_VERSION 19.03.1 - -RUN Invoke-WebRequest 'http://constexpr.org/innoextract/files/innoextract-1.7-windows.zip' -OutFile 'innoextract.zip' -UseBasicParsing ; ` - Expand-Archive innoextract.zip -DestinationPath C:\ ; ` - Remove-Item -Path innoextract.zip - -RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 ; ` - Invoke-WebRequest $('https://github.com/docker/toolbox/releases/download/v{0}/DockerToolbox-{0}.exe' -f $env:DOCKER_VERSION) -OutFile 'dockertoolbox.exe' -UseBasicParsing -RUN /innoextract.exe dockertoolbox.exe - -FROM mcr.microsoft.com/windows/nanoserver:1909 -USER ContainerAdministrator - -LABEL maintainer="Drone.IO Community " ` - org.label-schema.name="Drone Docker" ` - org.label-schema.vendor="Drone.IO Community" ` - org.label-schema.schema-version="1.0" - -RUN mkdir C:\bin -COPY --from=download /windows/system32/netapi32.dll /windows/system32/netapi32.dll -COPY --from=download /app/docker.exe C:/bin/docker.exe -ADD release/windows/amd64/drone-docker.exe C:/bin/drone-docker.exe -ENTRYPOINT [ "C:\\bin\\drone-docker.exe" ] diff --git a/docker/docker/manifest.tmpl b/docker/docker/manifest.tmpl index 4766c36..70e6f13 100644 --- a/docker/docker/manifest.tmpl +++ b/docker/docker/manifest.tmpl @@ -11,39 +11,3 @@ manifests: platform: architecture: amd64 os: linux - - - image: plugins/docker:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-arm64 - platform: - architecture: arm64 - os: linux - variant: v8 - - - image: plugins/docker:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-arm - platform: - architecture: arm - os: linux - variant: v7 - - - image: plugins/docker:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}windows-1803 - platform: - architecture: amd64 - os: windows - version: 1803 - - - image: plugins/docker:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}windows-1809-amd64 - platform: - architecture: amd64 - os: windows - version: 1809 - - - image: plugins/docker:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}windows-1903-amd64 - platform: - architecture: amd64 - os: windows - version: 1903 - - - image: plugins/docker:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}windows-1909-amd64 - platform: - architecture: amd64 - os: windows - version: 1909 diff --git a/docker/ecr/Dockerfile.linux.amd64 b/docker/ecr/Dockerfile.linux.amd64 index 5f7ab8b..a08de40 100644 --- a/docker/ecr/Dockerfile.linux.amd64 +++ b/docker/ecr/Dockerfile.linux.amd64 @@ -1,4 +1,7 @@ -FROM plugins/docker:linux-amd64 +FROM gcr.io/kaniko-project/executor:debug-v0.19.0 -ADD release/linux/amd64/drone-ecr /bin/ -ENTRYPOINT ["/usr/local/bin/dockerd-entrypoint.sh", "/bin/drone-ecr"] +ENV HOME /root +ENV USER root + +ADD release/linux/amd64/kaniko-ecr /kaniko/ +ENTRYPOINT ["/kaniko/kaniko-ecr"] diff --git a/docker/ecr/Dockerfile.linux.arm b/docker/ecr/Dockerfile.linux.arm deleted file mode 100644 index f8dd9e3..0000000 --- a/docker/ecr/Dockerfile.linux.arm +++ /dev/null @@ -1,4 +0,0 @@ -FROM plugins/docker:linux-arm - -ADD release/linux/arm/drone-ecr /bin/ -ENTRYPOINT ["/usr/local/bin/dockerd-entrypoint.sh", "/bin/drone-ecr"] diff --git a/docker/ecr/Dockerfile.linux.arm64 b/docker/ecr/Dockerfile.linux.arm64 deleted file mode 100644 index 83ed26a..0000000 --- a/docker/ecr/Dockerfile.linux.arm64 +++ /dev/null @@ -1,4 +0,0 @@ -FROM plugins/docker:linux-arm64 - -ADD release/linux/arm64/drone-ecr /bin/ -ENTRYPOINT ["/usr/local/bin/dockerd-entrypoint.sh", "/bin/drone-ecr"] diff --git a/docker/ecr/Dockerfile.windows.1803 b/docker/ecr/Dockerfile.windows.1803 deleted file mode 100644 index 367cfb2..0000000 --- a/docker/ecr/Dockerfile.windows.1803 +++ /dev/null @@ -1,10 +0,0 @@ -# escape=` -FROM plugins/docker:windows-1803 - -LABEL maintainer="Drone.IO Community " ` - org.label-schema.name="Drone ECR" ` - org.label-schema.vendor="Drone.IO Community" ` - org.label-schema.schema-version="1.0" - -ADD release/windows/amd64/drone-ecr.exe C:/bin/drone-ecr.exe -ENTRYPOINT [ "C:\\bin\\drone-ecr.exe" ] diff --git a/docker/ecr/Dockerfile.windows.1809 b/docker/ecr/Dockerfile.windows.1809 deleted file mode 100644 index 4d12228..0000000 --- a/docker/ecr/Dockerfile.windows.1809 +++ /dev/null @@ -1,10 +0,0 @@ -# escape=` -FROM plugins/docker:windows-1809 - -LABEL maintainer="Drone.IO Community " ` - org.label-schema.name="Drone ECR" ` - org.label-schema.vendor="Drone.IO Community" ` - org.label-schema.schema-version="1.0" - -ADD release/windows/amd64/drone-ecr.exe C:/bin/drone-ecr.exe -ENTRYPOINT [ "C:\\bin\\drone-ecr.exe" ] diff --git a/docker/ecr/manifest.tmpl b/docker/ecr/manifest.tmpl index 8af16c7..f1a72ad 100644 --- a/docker/ecr/manifest.tmpl +++ b/docker/ecr/manifest.tmpl @@ -1,4 +1,4 @@ -image: plugins/ecr:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}} +image: plugins/kaniko-ecr:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}} {{#if build.tags}} tags: {{#each build.tags}} @@ -7,31 +7,7 @@ tags: {{/if}} manifests: - - image: plugins/ecr:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-amd64 + image: plugins/kaniko-ecr:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-amd64 platform: architecture: amd64 - os: linux - - - image: plugins/ecr:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-arm64 - platform: - architecture: arm64 - os: linux - variant: v8 - - - image: plugins/ecr:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-arm - platform: - architecture: arm - os: linux - variant: v7 - - - image: plugins/ecr:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}windows-1803 - platform: - architecture: amd64 - os: windows - version: 1803 - - - image: plugins/ecr:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}windows-1809 - platform: - architecture: amd64 - os: windows - version: 1809 + os: linux \ No newline at end of file diff --git a/docker/gcr/Dockerfile.linux.amd64 b/docker/gcr/Dockerfile.linux.amd64 index b756e04..15a777b 100644 --- a/docker/gcr/Dockerfile.linux.amd64 +++ b/docker/gcr/Dockerfile.linux.amd64 @@ -1,4 +1,7 @@ -FROM plugins/docker:linux-amd64 +FROM gcr.io/kaniko-project/executor:debug-v0.19.0 -ADD release/linux/amd64/drone-gcr /bin/ -ENTRYPOINT ["/usr/local/bin/dockerd-entrypoint.sh", "/bin/drone-gcr"] +ENV HOME /root +ENV USER root + +ADD release/linux/amd64/kaniko-gcr /kaniko/ +ENTRYPOINT ["/kaniko/kaniko-gcr"] \ No newline at end of file diff --git a/docker/gcr/Dockerfile.linux.arm b/docker/gcr/Dockerfile.linux.arm deleted file mode 100644 index 718ce0f..0000000 --- a/docker/gcr/Dockerfile.linux.arm +++ /dev/null @@ -1,4 +0,0 @@ -FROM plugins/docker:linux-arm - -ADD release/linux/arm/drone-gcr /bin/ -ENTRYPOINT ["/usr/local/bin/dockerd-entrypoint.sh", "/bin/drone-gcr"] diff --git a/docker/gcr/Dockerfile.linux.arm64 b/docker/gcr/Dockerfile.linux.arm64 deleted file mode 100644 index 396e373..0000000 --- a/docker/gcr/Dockerfile.linux.arm64 +++ /dev/null @@ -1,4 +0,0 @@ -FROM plugins/docker:linux-arm64 - -ADD release/linux/arm64/drone-gcr /bin/ -ENTRYPOINT ["/usr/local/bin/dockerd-entrypoint.sh", "/bin/drone-gcr"] diff --git a/docker/gcr/Dockerfile.windows.1803 b/docker/gcr/Dockerfile.windows.1803 deleted file mode 100644 index 76bac6f..0000000 --- a/docker/gcr/Dockerfile.windows.1803 +++ /dev/null @@ -1,10 +0,0 @@ -# escape=` -FROM plugins/docker:windows-1803 - -LABEL maintainer="Drone.IO Community " ` - org.label-schema.name="Drone GCR" ` - org.label-schema.vendor="Drone.IO Community" ` - org.label-schema.schema-version="1.0" - -ADD release/windows/amd64/drone-gcr.exe C:/bin/drone-gcr.exe -ENTRYPOINT [ "C:\\bin\\drone-gcr.exe" ] diff --git a/docker/gcr/Dockerfile.windows.1809 b/docker/gcr/Dockerfile.windows.1809 deleted file mode 100644 index 1b1134b..0000000 --- a/docker/gcr/Dockerfile.windows.1809 +++ /dev/null @@ -1,10 +0,0 @@ -# escape=` -FROM plugins/docker:windows-1809 - -LABEL maintainer="Drone.IO Community " ` - org.label-schema.name="Drone GCR" ` - org.label-schema.vendor="Drone.IO Community" ` - org.label-schema.schema-version="1.0" - -ADD release/windows/amd64/drone-gcr.exe C:/bin/drone-gcr.exe -ENTRYPOINT [ "C:\\bin\\drone-gcr.exe" ] diff --git a/docker/gcr/manifest.tmpl b/docker/gcr/manifest.tmpl index 8b9231a..1cf1a75 100644 --- a/docker/gcr/manifest.tmpl +++ b/docker/gcr/manifest.tmpl @@ -1,4 +1,4 @@ -image: plugins/gcr:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}} +image: plugins/kaniko-gcr:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}} {{#if build.tags}} tags: {{#each build.tags}} @@ -7,31 +7,7 @@ tags: {{/if}} manifests: - - image: plugins/gcr:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-amd64 + image: plugins/kaniko-gcr:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-amd64 platform: architecture: amd64 os: linux - - - image: plugins/gcr:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-arm64 - platform: - architecture: arm64 - os: linux - variant: v8 - - - image: plugins/gcr:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-arm - platform: - architecture: arm - os: linux - variant: v7 - - - image: plugins/gcr:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}windows-1803 - platform: - architecture: amd64 - os: windows - version: 1803 - - - image: plugins/gcr:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}windows-1809 - platform: - architecture: amd64 - os: windows - version: 1809 diff --git a/docker_test.go b/docker_test.go deleted file mode 100644 index 1cdc3ff..0000000 --- a/docker_test.go +++ /dev/null @@ -1 +0,0 @@ -package docker diff --git a/go.mod b/go.mod index d9678c3..4be4580 100644 --- a/go.mod +++ b/go.mod @@ -1,14 +1,10 @@ -module github.com/drone-plugins/drone-docker +module github.com/drone/drone-kaniko require ( - github.com/aws/aws-sdk-go v1.26.7 - github.com/coreos/go-semver v0.2.0 github.com/joho/godotenv v1.3.0 github.com/pkg/errors v0.9.1 github.com/sirupsen/logrus v1.3.0 github.com/urfave/cli v1.22.2 - golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e // indirect - golang.org/x/text v0.3.0 // indirect ) go 1.13 diff --git a/go.sum b/go.sum index 7530e75..b8f0b04 100644 --- a/go.sum +++ b/go.sum @@ -1,14 +1,8 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/aws/aws-sdk-go v1.26.7 h1:ObjEnmzvSdYy8KVd3me7v/UMyCn81inLy2SyoIPoBkg= -github.com/aws/aws-sdk-go v1.26.7/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= -github.com/coreos/go-semver v0.2.0 h1:3Jm3tLmsgAYcjC+4Up7hJrFBPr+n7rAqYeSw/SZazuY= -github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d h1:U+s90UTSYgptZMwQh2aRr3LuazLJIa+Pg3Kc1ylSYVY= github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af h1:pmfjZENx5imkbgOkpRUYLnmbU7UEFbjtDA2hxJ1ichM= -github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= github.com/joho/godotenv v1.3.0 h1:Zjp+RcGpHhGlrMbJzXTrZZPrWj+1vfm90La1wgB6Bhc= github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg= github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk= @@ -26,18 +20,12 @@ github.com/sirupsen/logrus v1.3.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPx github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= -github.com/urfave/cli v1.20.0 h1:fDqGv3UG/4jbVl/QkFwEdddtEDjh/5Ov6X+0B/3bPaw= -github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= github.com/urfave/cli v1.22.2 h1:gsqYFH8bb9ekPA12kRo0hfjngWQjkJPlN9R0N78BoUo= github.com/urfave/cli v1.22.2/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793 h1:u+LnwYTOOW7Ukr/fppxEb1Nwz0AtPflrblfvUudpo+I= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= -golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e h1:bRhVy7zSSasaqNksaRZiA5EEI+Ei4I1nO5Jh72wfHlg= -golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33 h1:I6FyU15t786LL7oL/hn43zqTuEGr4PN7F4XJ1p4E3Y8= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= -golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= diff --git a/docker.go b/kaniko.go similarity index 99% rename from docker.go rename to kaniko.go index 5cf1700..c1d079a 100644 --- a/docker.go +++ b/kaniko.go @@ -1,4 +1,4 @@ -package docker +package kaniko import ( "fmt" diff --git a/kaniko_test.go b/kaniko_test.go new file mode 100644 index 0000000..297e062 --- /dev/null +++ b/kaniko_test.go @@ -0,0 +1 @@ +package kaniko