diff --git a/.drone.jsonnet b/.drone.jsonnet index 544b25e..1cadebd 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -164,7 +164,6 @@ local PipelineBuildContainer(arch="amd64") = { pull: "always", settings: { dry_run: true, - tags: "linux-" + arch, dockerfile: "Dockerfile", repo: "xoxys/ansible-doctor", username: { "from_secret": "docker_username" }, @@ -177,14 +176,13 @@ local PipelineBuildContainer(arch="amd64") = { pull: "always", settings: { auto_tag: true, - auto_tag_suffix: "linux-" + arch, dockerfile: "Dockerfile", repo: "xoxys/ansible-doctor", username: { "from_secret": "docker_username" }, password: { "from_secret": "docker_password" }, }, when: { - ref: [ "refs/tags/**" ], + ref: ["refs/heads/master", "refs/tags/**"], }, }, ], diff --git a/.drone.yml b/.drone.yml index 618d926..4faf4ff 100644 --- a/.drone.yml +++ b/.drone.yml @@ -187,7 +187,6 @@ steps: password: from_secret: docker_password repo: xoxys/ansible-doctor - tags: linux-amd64 username: from_secret: docker_username @@ -196,7 +195,6 @@ steps: image: plugins/docker:linux-amd64 settings: auto_tag: true - auto_tag_suffix: linux-amd64 dockerfile: Dockerfile password: from_secret: docker_password @@ -205,6 +203,7 @@ steps: from_secret: docker_username when: ref: + - refs/heads/master - "refs/tags/**" trigger: @@ -240,7 +239,6 @@ steps: password: from_secret: docker_password repo: xoxys/ansible-doctor - tags: linux-arm64 username: from_secret: docker_username @@ -249,7 +247,6 @@ steps: image: plugins/docker:linux-arm64 settings: auto_tag: true - auto_tag_suffix: linux-arm64 dockerfile: Dockerfile password: from_secret: docker_password @@ -258,6 +255,7 @@ steps: from_secret: docker_username when: ref: + - refs/heads/master - "refs/tags/**" trigger: @@ -293,7 +291,6 @@ steps: password: from_secret: docker_password repo: xoxys/ansible-doctor - tags: linux-arm username: from_secret: docker_username @@ -302,7 +299,6 @@ steps: image: plugins/docker:linux-arm settings: auto_tag: true - auto_tag_suffix: linux-arm dockerfile: Dockerfile password: from_secret: docker_password @@ -311,6 +307,7 @@ steps: from_secret: docker_username when: ref: + - refs/heads/master - "refs/tags/**" trigger: @@ -360,6 +357,6 @@ depends_on: --- kind: signature -hmac: 9b8fd130a9d32ff9e8302b375eccc6d52572f3d218798d6153516c58a055c261 +hmac: 2db6ebb30be1f686e852ed208db770c956667f430738007d007380eaa81cab82 ... diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000..9bed66c --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,2 @@ +* FEATURE + * initial release diff --git a/manifest.tmpl b/manifest.tmpl deleted file mode 100644 index 172e04f..0000000 --- a/manifest.tmpl +++ /dev/null @@ -1,22 +0,0 @@ -image: xoxys/ansible-doctor:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}} -{{#if build.tags}} -tags: -{{#each build.tags}} - - {{ this}} -{{/each}} -{{/if}} -manifests: - - image: xoxys/ansible-doctor:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-amd64 - platform: - architecture: amd64 - os: linux - - - image: xoxys/ansible-doctor:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-arm64 - platform: - architecture: arm64 - os: linux - - - image: xoxys/ansible-doctor:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-arm - platform: - architecture: arm - os: linux