From 1b71fe6cddc357e2276b5b3d57a49e08351f3123 Mon Sep 17 00:00:00 2001 From: Don Date: Wed, 14 Oct 2020 07:14:13 -0700 Subject: [PATCH] Update Windows Dockerfiles --- docker/acr/Dockerfile.windows.1809 | 2 +- ...e.windows.1803 => Dockerfile.windows.1903} | 2 +- docker/acr/Dockerfile.windows.1909 | 10 +++++ docker/acr/Dockerfile.windows.2004 | 10 +++++ docker/acr/manifest.tmpl | 29 ++++++++----- docker/docker/Dockerfile.windows.1809 | 6 +-- docker/docker/Dockerfile.windows.1903 | 5 +-- docker/docker/Dockerfile.windows.1909 | 5 +-- ...e.windows.1803 => Dockerfile.windows.2004} | 9 ++-- docker/docker/manifest.tmpl | 41 ++++++++----------- docker/ecr/Dockerfile.windows.1809 | 2 +- ...e.windows.1803 => Dockerfile.windows.1903} | 2 +- docker/ecr/Dockerfile.windows.1909 | 10 +++++ docker/ecr/Dockerfile.windows.2004 | 10 +++++ docker/ecr/manifest.tmpl | 29 ++++++++----- docker/gcr/Dockerfile.windows.1809 | 2 +- ...e.windows.1803 => Dockerfile.windows.1903} | 2 +- docker/gcr/Dockerfile.windows.1909 | 10 +++++ docker/gcr/Dockerfile.windows.2004 | 10 +++++ docker/gcr/manifest.tmpl | 29 ++++++++----- docker/heroku/manifest.tmpl | 11 +++-- 21 files changed, 155 insertions(+), 81 deletions(-) rename docker/acr/{Dockerfile.windows.1803 => Dockerfile.windows.1903} (88%) create mode 100644 docker/acr/Dockerfile.windows.1909 create mode 100644 docker/acr/Dockerfile.windows.2004 rename docker/docker/{Dockerfile.windows.1803 => Dockerfile.windows.2004} (83%) rename docker/ecr/{Dockerfile.windows.1803 => Dockerfile.windows.1903} (88%) create mode 100644 docker/ecr/Dockerfile.windows.1909 create mode 100644 docker/ecr/Dockerfile.windows.2004 rename docker/gcr/{Dockerfile.windows.1803 => Dockerfile.windows.1903} (88%) create mode 100644 docker/gcr/Dockerfile.windows.1909 create mode 100644 docker/gcr/Dockerfile.windows.2004 diff --git a/docker/acr/Dockerfile.windows.1809 b/docker/acr/Dockerfile.windows.1809 index dfa264d..c03c17c 100644 --- a/docker/acr/Dockerfile.windows.1809 +++ b/docker/acr/Dockerfile.windows.1809 @@ -1,5 +1,5 @@ # escape=` -FROM plugins/docker:windows-1809 +FROM plugins/docker:windows-1809-amd64 LABEL maintainer="Drone.IO Community " ` org.label-schema.name="Drone ACR" ` diff --git a/docker/acr/Dockerfile.windows.1803 b/docker/acr/Dockerfile.windows.1903 similarity index 88% rename from docker/acr/Dockerfile.windows.1803 rename to docker/acr/Dockerfile.windows.1903 index f7b3fdd..dbe8288 100644 --- a/docker/acr/Dockerfile.windows.1803 +++ b/docker/acr/Dockerfile.windows.1903 @@ -1,5 +1,5 @@ # escape=` -FROM plugins/docker:windows-1803 +FROM plugins/docker:windows-1903-amd64 LABEL maintainer="Drone.IO Community " ` org.label-schema.name="Drone ACR" ` diff --git a/docker/acr/Dockerfile.windows.1909 b/docker/acr/Dockerfile.windows.1909 new file mode 100644 index 0000000..9b94ccd --- /dev/null +++ b/docker/acr/Dockerfile.windows.1909 @@ -0,0 +1,10 @@ +# escape=` +FROM plugins/docker:windows-1909-amd64 + +LABEL maintainer="Drone.IO Community " ` + org.label-schema.name="Drone ACR" ` + org.label-schema.vendor="Drone.IO Community" ` + org.label-schema.schema-version="1.0" + +ADD release/windows/amd64/drone-acr.exe C:/bin/drone-acr.exe +ENTRYPOINT [ "C:\\bin\\drone-acr.exe" ] diff --git a/docker/acr/Dockerfile.windows.2004 b/docker/acr/Dockerfile.windows.2004 new file mode 100644 index 0000000..cf92a5b --- /dev/null +++ b/docker/acr/Dockerfile.windows.2004 @@ -0,0 +1,10 @@ +# escape=` +FROM plugins/docker:windows-2004-amd64 + +LABEL maintainer="Drone.IO Community " ` + org.label-schema.name="Drone ACR" ` + org.label-schema.vendor="Drone.IO Community" ` + org.label-schema.schema-version="1.0" + +ADD release/windows/amd64/drone-acr.exe C:/bin/drone-acr.exe +ENTRYPOINT [ "C:\\bin\\drone-acr.exe" ] diff --git a/docker/acr/manifest.tmpl b/docker/acr/manifest.tmpl index d1acb34..cf31da1 100644 --- a/docker/acr/manifest.tmpl +++ b/docker/acr/manifest.tmpl @@ -1,36 +1,43 @@ image: plugins/acr:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}} + {{#if build.tags}} tags: {{#each build.tags}} - {{this}} {{/each}} {{/if}} + manifests: - - - image: plugins/acr:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-amd64 + - image: plugins/acr:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-amd64 platform: architecture: amd64 os: linux - - - image: plugins/acr:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-arm64 + - image: plugins/acr:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-arm64 platform: architecture: arm64 os: linux variant: v8 - - - image: plugins/acr:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-arm + - image: plugins/acr:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-arm platform: architecture: arm os: linux variant: v7 - - - image: plugins/acr:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}windows-1803 + - image: plugins/acr:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}windows-2004-amd64 platform: architecture: amd64 os: windows - version: 1803 - - - image: plugins/acr:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}windows-1809 + version: 2004 + - image: plugins/acr:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}windows-1909-amd64 + platform: + architecture: amd64 + os: windows + version: 1909 + - image: plugins/acr:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}windows-1903-amd64 + platform: + architecture: amd64 + os: windows + version: 1903 + - image: plugins/acr:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}windows-1809-amd64 platform: architecture: amd64 os: windows diff --git a/docker/docker/Dockerfile.windows.1809 b/docker/docker/Dockerfile.windows.1809 index bffc4b4..7a23d48 100644 --- a/docker/docker/Dockerfile.windows.1809 +++ b/docker/docker/Dockerfile.windows.1809 @@ -3,9 +3,9 @@ FROM mcr.microsoft.com/windows/servercore:1809 as download SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] -ENV DOCKER_VERSION 18.09.1 +ENV DOCKER_VERSION 19.03.1 -RUN Invoke-WebRequest 'http://constexpr.org/innoextract/files/innoextract-1.6-windows.zip' -OutFile 'innoextract.zip' -UseBasicParsing ; ` +RUN Invoke-WebRequest 'http://constexpr.org/innoextract/files/innoextract-1.9-windows.zip' -OutFile 'innoextract.zip' -UseBasicParsing ; ` Expand-Archive innoextract.zip -DestinationPath C:\ ; ` Remove-Item -Path innoextract.zip @@ -13,7 +13,7 @@ RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tl 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 +FROM plugins/base:windows-1809-amd64 USER ContainerAdministrator LABEL maintainer="Drone.IO Community " ` diff --git a/docker/docker/Dockerfile.windows.1903 b/docker/docker/Dockerfile.windows.1903 index a6eadef..8a41d00 100644 --- a/docker/docker/Dockerfile.windows.1903 +++ b/docker/docker/Dockerfile.windows.1903 @@ -5,7 +5,7 @@ SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPref ENV DOCKER_VERSION 19.03.1 -RUN Invoke-WebRequest 'http://constexpr.org/innoextract/files/innoextract-1.7-windows.zip' -OutFile 'innoextract.zip' -UseBasicParsing ; ` +RUN Invoke-WebRequest 'http://constexpr.org/innoextract/files/innoextract-1.9-windows.zip' -OutFile 'innoextract.zip' -UseBasicParsing ; ` Expand-Archive innoextract.zip -DestinationPath C:\ ; ` Remove-Item -Path innoextract.zip @@ -13,7 +13,7 @@ RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tl 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 +FROM plugins/base:windows-1903-amd64 USER ContainerAdministrator LABEL maintainer="Drone.IO Community " ` @@ -21,7 +21,6 @@ LABEL maintainer="Drone.IO Community " ` 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 diff --git a/docker/docker/Dockerfile.windows.1909 b/docker/docker/Dockerfile.windows.1909 index e8dc3ae..af871ca 100644 --- a/docker/docker/Dockerfile.windows.1909 +++ b/docker/docker/Dockerfile.windows.1909 @@ -5,7 +5,7 @@ SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPref ENV DOCKER_VERSION 19.03.1 -RUN Invoke-WebRequest 'http://constexpr.org/innoextract/files/innoextract-1.7-windows.zip' -OutFile 'innoextract.zip' -UseBasicParsing ; ` +RUN Invoke-WebRequest 'http://constexpr.org/innoextract/files/innoextract-1.9-windows.zip' -OutFile 'innoextract.zip' -UseBasicParsing ; ` Expand-Archive innoextract.zip -DestinationPath C:\ ; ` Remove-Item -Path innoextract.zip @@ -13,7 +13,7 @@ RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tl 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 +FROM plugins/base:windows-1909-amd64 USER ContainerAdministrator LABEL maintainer="Drone.IO Community " ` @@ -21,7 +21,6 @@ LABEL maintainer="Drone.IO Community " ` 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 diff --git a/docker/docker/Dockerfile.windows.1803 b/docker/docker/Dockerfile.windows.2004 similarity index 83% rename from docker/docker/Dockerfile.windows.1803 rename to docker/docker/Dockerfile.windows.2004 index 41352d7..89f5102 100644 --- a/docker/docker/Dockerfile.windows.1803 +++ b/docker/docker/Dockerfile.windows.2004 @@ -1,11 +1,11 @@ # escape=` -FROM mcr.microsoft.com/windows/servercore:1803 as download +FROM mcr.microsoft.com/windows/servercore:2004 as download SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] -ENV DOCKER_VERSION 18.09.1 +ENV DOCKER_VERSION 19.03.1 -RUN Invoke-WebRequest 'http://constexpr.org/innoextract/files/innoextract-1.6-windows.zip' -OutFile 'innoextract.zip' -UseBasicParsing ; ` +RUN Invoke-WebRequest 'http://constexpr.org/innoextract/files/innoextract-1.9-windows.zip' -OutFile 'innoextract.zip' -UseBasicParsing ; ` Expand-Archive innoextract.zip -DestinationPath C:\ ; ` Remove-Item -Path innoextract.zip @@ -13,7 +13,8 @@ RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tl 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 +FROM plugins/base:windows-2004-amd64 +USER ContainerAdministrator LABEL maintainer="Drone.IO Community " ` org.label-schema.name="Drone Docker" ` diff --git a/docker/docker/manifest.tmpl b/docker/docker/manifest.tmpl index 4766c36..77d3d9d 100644 --- a/docker/docker/manifest.tmpl +++ b/docker/docker/manifest.tmpl @@ -1,49 +1,44 @@ image: plugins/docker:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}} + {{#if build.tags}} tags: {{#each build.tags}} - {{this}} {{/each}} {{/if}} + manifests: - - - image: plugins/docker:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-amd64 + - image: plugins/docker:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-amd64 platform: architecture: amd64 os: linux - - - image: plugins/docker:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-arm64 + - 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 + - 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 + - image: plugins/docker:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}windows-2004-amd64 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 + version: 2004 + - image: plugins/docker:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}windows-1909-amd64 platform: architecture: amd64 os: windows version: 1909 + - 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-1809-amd64 + platform: + architecture: amd64 + os: windows + version: 1809 diff --git a/docker/ecr/Dockerfile.windows.1809 b/docker/ecr/Dockerfile.windows.1809 index 4d12228..67803aa 100644 --- a/docker/ecr/Dockerfile.windows.1809 +++ b/docker/ecr/Dockerfile.windows.1809 @@ -1,5 +1,5 @@ # escape=` -FROM plugins/docker:windows-1809 +FROM plugins/docker:windows-1809-amd64 LABEL maintainer="Drone.IO Community " ` org.label-schema.name="Drone ECR" ` diff --git a/docker/ecr/Dockerfile.windows.1803 b/docker/ecr/Dockerfile.windows.1903 similarity index 88% rename from docker/ecr/Dockerfile.windows.1803 rename to docker/ecr/Dockerfile.windows.1903 index 367cfb2..c4bc4dd 100644 --- a/docker/ecr/Dockerfile.windows.1803 +++ b/docker/ecr/Dockerfile.windows.1903 @@ -1,5 +1,5 @@ # escape=` -FROM plugins/docker:windows-1803 +FROM plugins/docker:windows-1903-amd64 LABEL maintainer="Drone.IO Community " ` org.label-schema.name="Drone ECR" ` diff --git a/docker/ecr/Dockerfile.windows.1909 b/docker/ecr/Dockerfile.windows.1909 new file mode 100644 index 0000000..ae6e96f --- /dev/null +++ b/docker/ecr/Dockerfile.windows.1909 @@ -0,0 +1,10 @@ +# escape=` +FROM plugins/docker:windows-1909-amd64 + +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.2004 b/docker/ecr/Dockerfile.windows.2004 new file mode 100644 index 0000000..78ef5e7 --- /dev/null +++ b/docker/ecr/Dockerfile.windows.2004 @@ -0,0 +1,10 @@ +# escape=` +FROM plugins/docker:windows-2004-amd64 + +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..e336dbb 100644 --- a/docker/ecr/manifest.tmpl +++ b/docker/ecr/manifest.tmpl @@ -1,36 +1,43 @@ image: plugins/ecr:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}} + {{#if build.tags}} tags: {{#each build.tags}} - {{this}} {{/each}} {{/if}} + manifests: - - - image: plugins/ecr:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-amd64 + - image: plugins/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 + - 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 + - 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 + - image: plugins/ecr:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}windows-2004-amd64 platform: architecture: amd64 os: windows - version: 1803 - - - image: plugins/ecr:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}windows-1809 + version: 2004 + - image: plugins/ecr:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}windows-1909-amd64 + platform: + architecture: amd64 + os: windows + version: 1909 + - image: plugins/ecr:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}windows-1903-amd64 + platform: + architecture: amd64 + os: windows + version: 1903 + - image: plugins/ecr:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}windows-1809-amd64 platform: architecture: amd64 os: windows diff --git a/docker/gcr/Dockerfile.windows.1809 b/docker/gcr/Dockerfile.windows.1809 index 1b1134b..447013d 100644 --- a/docker/gcr/Dockerfile.windows.1809 +++ b/docker/gcr/Dockerfile.windows.1809 @@ -1,5 +1,5 @@ # escape=` -FROM plugins/docker:windows-1809 +FROM plugins/docker:windows-1809-amd64 LABEL maintainer="Drone.IO Community " ` org.label-schema.name="Drone GCR" ` diff --git a/docker/gcr/Dockerfile.windows.1803 b/docker/gcr/Dockerfile.windows.1903 similarity index 88% rename from docker/gcr/Dockerfile.windows.1803 rename to docker/gcr/Dockerfile.windows.1903 index 76bac6f..8797d4a 100644 --- a/docker/gcr/Dockerfile.windows.1803 +++ b/docker/gcr/Dockerfile.windows.1903 @@ -1,5 +1,5 @@ # escape=` -FROM plugins/docker:windows-1803 +FROM plugins/docker:windows-1903-amd64 LABEL maintainer="Drone.IO Community " ` org.label-schema.name="Drone GCR" ` diff --git a/docker/gcr/Dockerfile.windows.1909 b/docker/gcr/Dockerfile.windows.1909 new file mode 100644 index 0000000..faf2274 --- /dev/null +++ b/docker/gcr/Dockerfile.windows.1909 @@ -0,0 +1,10 @@ +# escape=` +FROM plugins/docker:windows-1909-amd64 + +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.2004 b/docker/gcr/Dockerfile.windows.2004 new file mode 100644 index 0000000..9bba6de --- /dev/null +++ b/docker/gcr/Dockerfile.windows.2004 @@ -0,0 +1,10 @@ +# escape=` +FROM plugins/docker:windows-2004-amd64 + +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..d48b92c 100644 --- a/docker/gcr/manifest.tmpl +++ b/docker/gcr/manifest.tmpl @@ -1,36 +1,43 @@ image: plugins/gcr:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}} + {{#if build.tags}} tags: {{#each build.tags}} - {{this}} {{/each}} {{/if}} + manifests: - - - image: plugins/gcr:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-amd64 + - image: plugins/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 + - 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 + - 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 + - image: plugins/gcr:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}windows-2004-amd64 platform: architecture: amd64 os: windows - version: 1803 - - - image: plugins/gcr:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}windows-1809 + version: 2004 + - image: plugins/gcr:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}windows-1909-amd64 + platform: + architecture: amd64 + os: windows + version: 1909 + - image: plugins/gcr:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}windows-1903-amd64 + platform: + architecture: amd64 + os: windows + version: 1903 + - image: plugins/gcr:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}windows-1809-amd64 platform: architecture: amd64 os: windows diff --git a/docker/heroku/manifest.tmpl b/docker/heroku/manifest.tmpl index 28ed9a5..5655a9b 100644 --- a/docker/heroku/manifest.tmpl +++ b/docker/heroku/manifest.tmpl @@ -1,24 +1,23 @@ image: plugins/heroku:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}} + {{#if build.tags}} tags: {{#each build.tags}} - {{this}} {{/each}} {{/if}} + manifests: - - - image: plugins/heroku:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-amd64 + - image: plugins/heroku:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-amd64 platform: architecture: amd64 os: linux - - - image: plugins/heroku:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-arm64 + - image: plugins/heroku:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-arm64 platform: architecture: arm64 os: linux variant: v8 - - - image: plugins/heroku:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-arm + - image: plugins/heroku:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-arm platform: architecture: arm os: linux