small fixes

This commit is contained in:
Robert Kaussow 2019-10-08 17:33:20 +02:00
parent e0565bd5ca
commit 5f2215457c
6 changed files with 14 additions and 14 deletions

View File

@ -177,7 +177,7 @@ local PipelineBuildContainer(arch="amd64") = {
pull: "always", pull: "always",
settings: { settings: {
dry_run: true, dry_run: true,
tags: arch, tags: "linux-" + arch,
dockerfile: "Dockerfile", dockerfile: "Dockerfile",
repo: "xoxys/ansible-doctor", repo: "xoxys/ansible-doctor",
username: { "from_secret": "docker_username" }, username: { "from_secret": "docker_username" },
@ -190,7 +190,7 @@ local PipelineBuildContainer(arch="amd64") = {
pull: "always", pull: "always",
settings: { settings: {
auto_tag: true, auto_tag: true,
auto_tag_suffix: arch, auto_tag_suffix: "linux-" + arch,
dockerfile: "Dockerfile", dockerfile: "Dockerfile",
repo: "xoxys/ansible-doctor", repo: "xoxys/ansible-doctor",
username: { "from_secret": "docker_username" }, username: { "from_secret": "docker_username" },

View File

@ -201,7 +201,7 @@ steps:
password: password:
from_secret: docker_password from_secret: docker_password
repo: xoxys/ansible-doctor repo: xoxys/ansible-doctor
tags: amd64 tags: linux-amd64
username: username:
from_secret: docker_username from_secret: docker_username
@ -210,7 +210,7 @@ steps:
image: plugins/docker:linux-amd64 image: plugins/docker:linux-amd64
settings: settings:
auto_tag: true auto_tag: true
auto_tag_suffix: amd64 auto_tag_suffix: linux-amd64
dockerfile: Dockerfile dockerfile: Dockerfile
password: password:
from_secret: docker_password from_secret: docker_password
@ -254,7 +254,7 @@ steps:
password: password:
from_secret: docker_password from_secret: docker_password
repo: xoxys/ansible-doctor repo: xoxys/ansible-doctor
tags: arm64 tags: linux-arm64
username: username:
from_secret: docker_username from_secret: docker_username
@ -263,7 +263,7 @@ steps:
image: plugins/docker:linux-arm64 image: plugins/docker:linux-arm64
settings: settings:
auto_tag: true auto_tag: true
auto_tag_suffix: arm64 auto_tag_suffix: linux-arm64
dockerfile: Dockerfile dockerfile: Dockerfile
password: password:
from_secret: docker_password from_secret: docker_password
@ -307,7 +307,7 @@ steps:
password: password:
from_secret: docker_password from_secret: docker_password
repo: xoxys/ansible-doctor repo: xoxys/ansible-doctor
tags: arm tags: linux-arm
username: username:
from_secret: docker_username from_secret: docker_username
@ -316,7 +316,7 @@ steps:
image: plugins/docker:linux-arm image: plugins/docker:linux-arm
settings: settings:
auto_tag: true auto_tag: true
auto_tag_suffix: arm auto_tag_suffix: linux-arm
dockerfile: Dockerfile dockerfile: Dockerfile
password: password:
from_secret: docker_password from_secret: docker_password
@ -374,6 +374,6 @@ depends_on:
--- ---
kind: signature kind: signature
hmac: 203b4f46bf25c54c5f2b24d5e863a1533711e2222740081751ab712a02acd348 hmac: 83297de5a39e79df11e7ec50709f8e06702186b9e6286133985bf918cb22ce81
... ...

View File

@ -18,3 +18,4 @@ RUN \
USER root USER root
CMD [] CMD []
ENTRYPOINT ["/usr/local/bin/ansible-doctor"]

View File

@ -1,2 +1,4 @@
# ansible-doctor # 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)

View File

@ -2,7 +2,7 @@
__author__ = "Robert Kaussow" __author__ = "Robert Kaussow"
__project__ = "ansible-doctor" __project__ = "ansible-doctor"
__version__ = "0.1.0" __version__ = "0.1.0-beta1"
__license__ = "GPL-3.0" __license__ = "GPL-3.0"
__maintainer__ = "Robert Kaussow" __maintainer__ = "Robert Kaussow"
__email__ = "mail@geeklabor.de" __email__ = "mail@geeklabor.de"

View File

@ -2,10 +2,7 @@ image: xoxys/ansible-doctor:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}
{{#if build.tags}} {{#if build.tags}}
tags: tags:
{{#each build.tags}} {{#each build.tags}}
{{#if this}} - {{ this}}
- {{trimPrefix "v" this}}
- {{trimPrefix "v" this}}-linux-amd64
{{/if}}
{{/each}} {{/each}}
{{/if}} {{/if}}
manifests: manifests: