diff --git a/.drone.jsonnet b/.drone.jsonnet index 6ef7622..e7a8b25 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -12,7 +12,6 @@ local images = [ ]; local tags = [ - '1803', '1809', '1903', '1909', diff --git a/.drone.yml b/.drone.yml index 873ba52..4134ed0 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,189 +1,3 @@ ---- -kind: pipeline -name: ServerCore 1803 Images - -platform: - os: windows - arch: amd64 - version: 1803 - -steps: -- name: build-base - pull: always - image: plugins/docker - settings: - auto_tag: true - auto_tag_suffix: 1803 - context: base - daemon_off: true - dockerfile: base/Dockerfile.1803 - password: - from_secret: docker_password - purge: false - repo: webkitdev/base - username: - from_secret: docker_username - volumes: - - name: docker_pipe - path: \\\\.\\pipe\\docker_engine - -- name: build-scripts - pull: always - image: plugins/docker - settings: - auto_tag: true - auto_tag_suffix: 1803 - build_args: - - IMAGE_TAG=1803 - context: scripts - daemon_off: true - dockerfile: scripts/Dockerfile - password: - from_secret: docker_password - purge: false - repo: webkitdev/scripts - username: - from_secret: docker_username - volumes: - - name: docker_pipe - path: \\\\.\\pipe\\docker_engine - -- name: build-scm - pull: always - image: plugins/docker - settings: - auto_tag: true - auto_tag_suffix: 1803 - build_args: - - IMAGE_TAG=1803 - context: scm - daemon_off: true - dockerfile: scm/Dockerfile - password: - from_secret: docker_password - purge: false - repo: webkitdev/scm - username: - from_secret: docker_username - volumes: - - name: docker_pipe - path: \\\\.\\pipe\\docker_engine - -- name: build-tools - pull: always - image: plugins/docker - settings: - auto_tag: true - auto_tag_suffix: 1803 - build_args: - - IMAGE_TAG=1803 - context: tools - daemon_off: true - dockerfile: tools/Dockerfile - password: - from_secret: docker_password - purge: false - repo: webkitdev/tools - username: - from_secret: docker_username - volumes: - - name: docker_pipe - path: \\\\.\\pipe\\docker_engine - -- name: build-msbuild - pull: always - image: plugins/docker - settings: - auto_tag: true - auto_tag_suffix: 1803 - build_args: - - IMAGE_TAG=1803 - context: msbuild - daemon_off: true - dockerfile: msbuild/Dockerfile - password: - from_secret: docker_password - purge: false - repo: webkitdev/msbuild - username: - from_secret: docker_username - volumes: - - name: docker_pipe - path: \\\\.\\pipe\\docker_engine - -- name: build-msbuild-2017 - pull: always - image: plugins/docker - settings: - auto_tag: true - auto_tag_suffix: 1803 - build_args: - - IMAGE_TAG=1803 - context: msbuild-2017 - daemon_off: true - dockerfile: msbuild-2017/Dockerfile - password: - from_secret: docker_password - purge: false - repo: webkitdev/msbuild-2017 - username: - from_secret: docker_username - volumes: - - name: docker_pipe - path: \\\\.\\pipe\\docker_engine - -- name: build-buildbot - pull: always - image: plugins/docker - settings: - auto_tag: true - auto_tag_suffix: 1803 - build_args: - - IMAGE_TAG=1803 - context: buildbot - daemon_off: true - dockerfile: buildbot/Dockerfile - password: - from_secret: docker_password - purge: false - repo: webkitdev/buildbot - username: - from_secret: docker_username - volumes: - - name: docker_pipe - path: \\\\.\\pipe\\docker_engine - -- name: build-ews - pull: always - image: plugins/docker - settings: - auto_tag: true - auto_tag_suffix: 1803 - build_args: - - IMAGE_TAG=1803 - context: ews - daemon_off: true - dockerfile: ews/Dockerfile - password: - from_secret: docker_password - purge: false - repo: webkitdev/ews - username: - from_secret: docker_username - volumes: - - name: docker_pipe - path: \\\\.\\pipe\\docker_engine - -volumes: -- name: docker_pipe - host: - path: \\\\.\\pipe\\docker_engine - -trigger: - ref: - - refs/heads/** - - refs/tags/** - --- kind: pipeline name: ServerCore 1809 Images @@ -1776,7 +1590,6 @@ trigger: - refs/tags/** depends_on: -- ServerCore 1803 Images - ServerCore 1809 Images - ServerCore 1903 Images - ServerCore 1909 Images diff --git a/Build-All.ps1 b/Build-All.ps1 index 2f2968b..2c637ca 100644 --- a/Build-All.ps1 +++ b/Build-All.ps1 @@ -1,6 +1,6 @@ param( [Parameter(Mandatory)] - [ValidateSet('1803','1809','1903','1909','2004','windows-1809','windows-1903','windows-1909','windows-2004')] + [ValidateSet('1809','1903','1909','2004','windows-1809','windows-1903','windows-1909','windows-2004')] [string]$tag ) diff --git a/Publish-All.ps1 b/Publish-All.ps1 index 8e14091..436f579 100644 --- a/Publish-All.ps1 +++ b/Publish-All.ps1 @@ -1,6 +1,6 @@ param( [Parameter(Mandatory)] - [ValidateSet('1803','1809','1903','1909','2004','windows-1809','windows-1903','windows-1909','windows-2004')] + [ValidateSet('1809','1903','1909','2004','windows-1809','windows-1903','windows-1909','windows-2004')] [string]$tag ) diff --git a/base/Dockerfile.1803 b/base/Dockerfile.1803 deleted file mode 100644 index bfcbc47..0000000 --- a/base/Dockerfile.1803 +++ /dev/null @@ -1 +0,0 @@ -FROM mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-1803@sha256:0ad6735e4c776d881ec2c48c1a61ad57f5ef3dfe3e0410c71e98c2e12942f907 diff --git a/base/Dockerfile.windows-1809 b/base/Dockerfile.windows-1809 index ed8197b..a3b85cf 100644 --- a/base/Dockerfile.windows-1809 +++ b/base/Dockerfile.windows-1809 @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/windows:1809@sha256:bf5f60839adcb5cfd775243bb86069deb88083217c656c456d90fbb685369aa5 +FROM mcr.microsoft.com/windows:1809@sha256:be38cab7b685c8b4bbc39b9ba79e743e582089c187fe8b79f6d8d230d017a6fe SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] diff --git a/base/Dockerfile.windows-1903 b/base/Dockerfile.windows-1903 index d94517b..e3f37ae 100644 --- a/base/Dockerfile.windows-1903 +++ b/base/Dockerfile.windows-1903 @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/windows:1903@sha256:9122394f5a4201eca8503f516e591899770ad0526ebacd503d92ffaf54882e38 +FROM mcr.microsoft.com/windows:1903@sha256:90cddfccd9e1bb07b25afa818da5e32ea588696c1e9306a112375cf2c51f6013 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] diff --git a/base/Dockerfile.windows-1909 b/base/Dockerfile.windows-1909 index abca667..6717b67 100644 --- a/base/Dockerfile.windows-1909 +++ b/base/Dockerfile.windows-1909 @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/windows:1909@sha256:7d3d74b4c3426e531088fba7539907bf30f87b05be2ff7372b9fad38ff212ed8 +FROM mcr.microsoft.com/windows:1909@sha256:ff36545dfd662bac093537312f206329536e128ec6960c011008a96238706ce6 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] diff --git a/base/Dockerfile.windows-2004 b/base/Dockerfile.windows-2004 index d49558e..1ddfce4 100644 --- a/base/Dockerfile.windows-2004 +++ b/base/Dockerfile.windows-2004 @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/windows:2004 +FROM mcr.microsoft.com/windows:2004@sha256:9969a52e217f195fe42fd798643535bd4f68e1d9dab4247496f87c8536315013 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] diff --git a/base/manifest.tmpl b/base/manifest.tmpl index 233e1d2..1b6e305 100644 --- a/base/manifest.tmpl +++ b/base/manifest.tmpl @@ -6,12 +6,6 @@ tags: {{/each}} {{/if}} manifests: - - - image: webkitdev/base:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}1803 - platform: - architecture: amd64 - os: windows - version: 1803 - image: webkitdev/base:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}1809 platform: diff --git a/buildbot/manifest.tmpl b/buildbot/manifest.tmpl index 8705e23..30e2da5 100644 --- a/buildbot/manifest.tmpl +++ b/buildbot/manifest.tmpl @@ -6,12 +6,6 @@ tags: {{/each}} {{/if}} manifests: - - - image: webkitdev/buildbot:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}1803 - platform: - architecture: amd64 - os: windows - version: 1803 - image: webkitdev/buildbot:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}1809 platform: diff --git a/ews-legacy/manifest.tmpl b/ews-legacy/manifest.tmpl index 4fdc9ee..400e08b 100644 --- a/ews-legacy/manifest.tmpl +++ b/ews-legacy/manifest.tmpl @@ -6,12 +6,6 @@ tags: {{/each}} {{/if}} manifests: - - - image: webkitdev/ews-legacy:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}1803 - platform: - architecture: amd64 - os: windows - version: 1803 - image: webkitdev/ews-legacy:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}1809 platform: diff --git a/ews/manifest.tmpl b/ews/manifest.tmpl index a257e0d..3f7d32f 100644 --- a/ews/manifest.tmpl +++ b/ews/manifest.tmpl @@ -6,12 +6,6 @@ tags: {{/each}} {{/if}} manifests: - - - image: webkitdev/ews:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}1803 - platform: - architecture: amd64 - os: windows - version: 1803 - image: webkitdev/ews:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}1809 platform: diff --git a/msbuild-2017/manifest.tmpl b/msbuild-2017/manifest.tmpl index 7b0a16a..80fedd6 100644 --- a/msbuild-2017/manifest.tmpl +++ b/msbuild-2017/manifest.tmpl @@ -6,12 +6,6 @@ tags: {{/each}} {{/if}} manifests: - - - image: webkitdev/msbuild-2017:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}1803 - platform: - architecture: amd64 - os: windows - version: 1803 - image: webkitdev/msbuild-2017:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}1809 platform: diff --git a/msbuild/manifest.tmpl b/msbuild/manifest.tmpl index 192d02f..8350870 100644 --- a/msbuild/manifest.tmpl +++ b/msbuild/manifest.tmpl @@ -6,12 +6,6 @@ tags: {{/each}} {{/if}} manifests: - - - image: webkitdev/msbuild:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}1803 - platform: - architecture: amd64 - os: windows - version: 1803 - image: webkitdev/msbuild:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}1809 platform: diff --git a/renovate.json b/renovate.json index b0a6035..a00d433 100644 --- a/renovate.json +++ b/renovate.json @@ -4,7 +4,7 @@ ], "dockerfile": { "fileMatch": [ - "base/Dockerfile\\.(1803|1809|1903|1909|2004|windows-1809|windows-1903|windows-1909|windows-2004)" + "base/Dockerfile\\.(1809|1903|1909|2004|windows-1809|windows-1903|windows-1909|windows-2004)" ], "pinDigests": true }, diff --git a/scm/manifest.tmpl b/scm/manifest.tmpl index 3b3d325..9cbd2f6 100644 --- a/scm/manifest.tmpl +++ b/scm/manifest.tmpl @@ -6,12 +6,6 @@ tags: {{/each}} {{/if}} manifests: - - - image: webkitdev/scm:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}1803 - platform: - architecture: amd64 - os: windows - version: 1803 - image: webkitdev/scm:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}1809 platform: diff --git a/scripts/manifest.tmpl b/scripts/manifest.tmpl index 93a4c67..10d5a6a 100644 --- a/scripts/manifest.tmpl +++ b/scripts/manifest.tmpl @@ -6,12 +6,6 @@ tags: {{/each}} {{/if}} manifests: - - - image: webkitdev/scripts:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}1803 - platform: - architecture: amd64 - os: windows - version: 1803 - image: webkitdev/scripts:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}1809 platform: diff --git a/tools/manifest.tmpl b/tools/manifest.tmpl index aa4b05a..cb1b06b 100644 --- a/tools/manifest.tmpl +++ b/tools/manifest.tmpl @@ -6,12 +6,6 @@ tags: {{/each}} {{/if}} manifests: - - - image: webkitdev/tools:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}1803 - platform: - architecture: amd64 - os: windows - version: 1803 - image: webkitdev/tools:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}1809 platform: