From 5f2215457c6a67851c702e90d19968ea09941d84 Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Tue, 8 Oct 2019 17:33:20 +0200 Subject: [PATCH] small fixes --- .drone.jsonnet | 4 ++-- .drone.yml | 14 +++++++------- Dockerfile | 1 + README.md | 2 ++ ansibledoctor/__init__.py | 2 +- manifest.tmpl | 5 +---- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.drone.jsonnet b/.drone.jsonnet index 6755a03..9fa0647 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -177,7 +177,7 @@ local PipelineBuildContainer(arch="amd64") = { pull: "always", settings: { dry_run: true, - tags: arch, + tags: "linux-" + arch, dockerfile: "Dockerfile", repo: "xoxys/ansible-doctor", username: { "from_secret": "docker_username" }, @@ -190,7 +190,7 @@ local PipelineBuildContainer(arch="amd64") = { pull: "always", settings: { auto_tag: true, - auto_tag_suffix: arch, + auto_tag_suffix: "linux-" + arch, dockerfile: "Dockerfile", repo: "xoxys/ansible-doctor", username: { "from_secret": "docker_username" }, diff --git a/.drone.yml b/.drone.yml index 5ea3b29..479249a 100644 --- a/.drone.yml +++ b/.drone.yml @@ -201,7 +201,7 @@ steps: password: from_secret: docker_password repo: xoxys/ansible-doctor - tags: amd64 + tags: linux-amd64 username: from_secret: docker_username @@ -210,7 +210,7 @@ steps: image: plugins/docker:linux-amd64 settings: auto_tag: true - auto_tag_suffix: amd64 + auto_tag_suffix: linux-amd64 dockerfile: Dockerfile password: from_secret: docker_password @@ -254,7 +254,7 @@ steps: password: from_secret: docker_password repo: xoxys/ansible-doctor - tags: arm64 + tags: linux-arm64 username: from_secret: docker_username @@ -263,7 +263,7 @@ steps: image: plugins/docker:linux-arm64 settings: auto_tag: true - auto_tag_suffix: arm64 + auto_tag_suffix: linux-arm64 dockerfile: Dockerfile password: from_secret: docker_password @@ -307,7 +307,7 @@ steps: password: from_secret: docker_password repo: xoxys/ansible-doctor - tags: arm + tags: linux-arm username: from_secret: docker_username @@ -316,7 +316,7 @@ steps: image: plugins/docker:linux-arm settings: auto_tag: true - auto_tag_suffix: arm + auto_tag_suffix: linux-arm dockerfile: Dockerfile password: from_secret: docker_password @@ -374,6 +374,6 @@ depends_on: --- kind: signature -hmac: 203b4f46bf25c54c5f2b24d5e863a1533711e2222740081751ab712a02acd348 +hmac: 83297de5a39e79df11e7ec50709f8e06702186b9e6286133985bf918cb22ce81 ... diff --git a/Dockerfile b/Dockerfile index db5083d..6646c1c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,3 +18,4 @@ RUN \ USER root CMD [] +ENTRYPOINT ["/usr/local/bin/ansible-doctor"] diff --git a/README.md b/README.md index 8a68cbf..1ace504 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,4 @@ # ansible-doctor +[![Build Status](https://cloud.drone.io/api/badges/xoxys/ansible-doctor/status.svg)](https://cloud.drone.io/xoxys/ansible-doctor) +![License](https://img.shields.io/github/license/xoxys/ansible-doctor) diff --git a/ansibledoctor/__init__.py b/ansibledoctor/__init__.py index cfb23f7..aae835e 100644 --- a/ansibledoctor/__init__.py +++ b/ansibledoctor/__init__.py @@ -2,7 +2,7 @@ __author__ = "Robert Kaussow" __project__ = "ansible-doctor" -__version__ = "0.1.0" +__version__ = "0.1.0-beta1" __license__ = "GPL-3.0" __maintainer__ = "Robert Kaussow" __email__ = "mail@geeklabor.de" diff --git a/manifest.tmpl b/manifest.tmpl index 999876b..172e04f 100644 --- a/manifest.tmpl +++ b/manifest.tmpl @@ -2,10 +2,7 @@ image: xoxys/ansible-doctor:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else} {{#if build.tags}} tags: {{#each build.tags}} - {{#if this}} - - {{trimPrefix "v" this}} - - {{trimPrefix "v" this}}-linux-amd64 - {{/if}} + - {{ this}} {{/each}} {{/if}} manifests: