From 430bddaf75828731a0029274a74ba6120774c926 Mon Sep 17 00:00:00 2001 From: Brad Rydzewski Date: Thu, 22 Aug 2019 13:21:17 -0700 Subject: [PATCH] bump to manifest 1.2 [ci skip] --- .drone.yml | 6 +++--- docker/manifest.agent.tmpl | 14 +++++++------- docker/manifest.controller.tmpl | 12 ++++++------ docker/manifest.server.tmpl | 8 ++++---- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/.drone.yml b/.drone.yml index f1b4adbf..555bcb09 100644 --- a/.drone.yml +++ b/.drone.yml @@ -270,7 +270,7 @@ name: manifest steps: - name: publish_server - image: plugins/manifest:1.1.0 + image: plugins/manifest:1.2 settings: auto_tag: true ignore_missing: true @@ -281,7 +281,7 @@ steps: from_secret: docker_password - name: publish_agent - image: plugins/manifest:1.1.0 + image: plugins/manifest:1.2 settings: auto_tag: true ignore_missing: true @@ -292,7 +292,7 @@ steps: from_secret: docker_password - name: publish_controller - image: plugins/manifest:1.1.0 + image: plugins/manifest:1.2 settings: auto_tag: true ignore_missing: true diff --git a/docker/manifest.agent.tmpl b/docker/manifest.agent.tmpl index 38eaf631..1db9863b 100644 --- a/docker/manifest.agent.tmpl +++ b/docker/manifest.agent.tmpl @@ -1,4 +1,4 @@ -image: drone/agent:{{#if build.tag}}{{trimPrefix build.tag "v"}}{{else}}latest{{/if}} +image: drone/agent:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}} {{#if build.tags}} tags: {{#each build.tags}} @@ -7,36 +7,36 @@ tags: {{/if}} manifests: - - image: drone/agent:{{#if build.tag}}{{trimPrefix build.tag "v"}}-{{/if}}linux-amd64 + image: drone/agent:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-amd64 platform: architecture: amd64 os: linux - - image: drone/agent:{{#if build.tag}}{{trimPrefix build.tag "v"}}-{{/if}}linux-arm64 + image: drone/agent:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-arm64 platform: architecture: arm64 os: linux variant: v8 - - image: drone/agent:{{#if build.tag}}{{trimPrefix build.tag "v"}}-{{/if}}linux-arm + image: drone/agent:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-arm platform: architecture: arm os: linux variant: v7 - - image: drone/agent:{{#if build.tag}}{{trimPrefix build.tag "v"}}-{{/if}}windows-1803-amd64 + image: drone/agent:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}windows-1803-amd64 platform: architecture: amd64 os: windows variant: 1803 - - image: drone/agent:{{#if build.tag}}{{trimPrefix build.tag "v"}}-{{/if}}windows-1809-amd64 + image: drone/agent:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}windows-1809-amd64 platform: architecture: amd64 os: windows variant: 1809 - - image: drone/agent:{{#if build.tag}}{{trimPrefix build.tag "v"}}-{{/if}}windows-1903-amd64 + image: drone/agent:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}windows-1903-amd64 platform: architecture: amd64 os: windows diff --git a/docker/manifest.controller.tmpl b/docker/manifest.controller.tmpl index bd8fca82..ec34401f 100644 --- a/docker/manifest.controller.tmpl +++ b/docker/manifest.controller.tmpl @@ -1,4 +1,4 @@ -image: drone/controller:{{#if build.tag}}{{trimPrefix build.tag "v"}}{{else}}latest{{/if}} +image: drone/controller:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}} {{#if build.tags}} tags: {{#each build.tags}} @@ -7,30 +7,30 @@ tags: {{/if}} manifests: - - image: drone/controller:{{#if build.tag}}{{trimPrefix build.tag "v"}}-{{/if}}linux-amd64 + image: drone/controller:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-amd64 platform: architecture: amd64 os: linux - - image: drone/controller:{{#if build.tag}}{{trimPrefix build.tag "v"}}-{{/if}}linux-arm64 + image: drone/controller:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-arm64 platform: architecture: arm64 os: linux variant: v8 - - image: drone/controller:{{#if build.tag}}{{trimPrefix build.tag "v"}}-{{/if}}linux-arm + image: drone/controller:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-arm platform: architecture: arm os: linux variant: v7 - - image: drone/controller:{{#if build.tag}}{{trimPrefix build.tag "v"}}-{{/if}}windows-1803-amd64 + image: drone/controller:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}windows-1803-amd64 platform: architecture: amd64 os: windows variant: 1803 - - image: drone/controller:{{#if build.tag}}{{trimPrefix build.tag "v"}}-{{/if}}windows-1809-amd64 + image: drone/controller:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}windows-1809-amd64 platform: architecture: amd64 os: windows diff --git a/docker/manifest.server.tmpl b/docker/manifest.server.tmpl index db37c75c..d96f0753 100644 --- a/docker/manifest.server.tmpl +++ b/docker/manifest.server.tmpl @@ -1,4 +1,4 @@ -image: drone/drone:{{#if build.tag}}{{trimPrefix build.tag "v"}}{{else}}latest{{/if}} +image: drone/drone:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}} {{#if build.tags}} tags: {{#each build.tags}} @@ -7,18 +7,18 @@ tags: {{/if}} manifests: - - image: drone/drone:{{#if build.tag}}{{trimPrefix build.tag "v"}}-{{/if}}linux-amd64 + image: drone/drone:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-amd64 platform: architecture: amd64 os: linux - - image: drone/drone:{{#if build.tag}}{{trimPrefix build.tag "v"}}-{{/if}}linux-arm64 + image: drone/drone:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-arm64 platform: architecture: arm64 os: linux variant: v8 - - image: drone/drone:{{#if build.tag}}{{trimPrefix build.tag "v"}}-{{/if}}linux-arm + image: drone/drone:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-arm platform: architecture: arm os: linux