small fixes
All checks were successful
continuous-integration/drone/push Build is passing

This commit is contained in:
Robert Kaussow 2020-02-21 23:27:39 +01:00
parent c130dff0ff
commit 569f9eb837
2 changed files with 48 additions and 19 deletions

View File

@ -11,10 +11,10 @@ local PipelineBuild(arch='amd64') = {
name: 'binary', name: 'binary',
image: 'clux/muslrust:nightly-2019-12-19', image: 'clux/muslrust:nightly-2019-12-19',
environment: { environment: {
'DB': 'postgresql', DB: 'postgresql',
'DEBIAN_FRONTEND': 'noninteractive', DEBIAN_FRONTEND: 'noninteractive',
'LANG': 'C.UTF-8', LANG: 'C.UTF-8',
'TZ': 'UTC', TZ: 'UTC',
}, },
commands: [ commands: [
'[ -z "${DRONE_TAG}" ] && LDAP_VERSION=master || LDAP_VERSION="${DRONE_TAG%-*}"', '[ -z "${DRONE_TAG}" ] && LDAP_VERSION=master || LDAP_VERSION="${DRONE_TAG%-*}"',
@ -30,7 +30,7 @@ local PipelineBuild(arch='amd64') = {
image: 'plugins/docker:' + tag, image: 'plugins/docker:' + tag,
settings: { settings: {
dry_run: true, dry_run: true,
dockerfile: './Dockerfile.' + arch, dockerfile: 'Dockerfile.' + arch,
repo: 'xoxys/bitwardenrs_ldap', repo: 'xoxys/bitwardenrs_ldap',
username: { from_secret: 'docker_username' }, username: { from_secret: 'docker_username' },
password: { from_secret: 'docker_password' }, password: { from_secret: 'docker_password' },
@ -47,7 +47,7 @@ local PipelineBuild(arch='amd64') = {
settings: { settings: {
auto_tag: true, auto_tag: true,
auto_tag_suffix: arch, auto_tag_suffix: arch,
dockerfile: './Dockerfile.' + arch, dockerfile: 'Dockerfile.' + arch,
repo: 'xoxys/bitwardenrs_ldap', repo: 'xoxys/bitwardenrs_ldap',
username: { from_secret: 'docker_username' }, username: { from_secret: 'docker_username' },
password: { from_secret: 'docker_password' }, password: { from_secret: 'docker_password' },
@ -89,10 +89,20 @@ local PipelineNotifications(depends_on=[]) = {
name: 'manifest', name: 'manifest',
settings: { settings: {
ignore_missing: true, ignore_missing: true,
tags: ['${DRONE_TAG}', '${DRONE_TAG%-*}', '${DRONE_TAG%.*}', '${DRONE_TAG%%.*}'], tags: [
'${DRONE_TAG}',
'${DRONE_TAG%-*}',
'${DRONE_TAG%.*}',
'${DRONE_TAG%%.*}',
],
username: { from_secret: 'docker_username' }, username: { from_secret: 'docker_username' },
password: { from_secret: 'docker_password' }, password: { from_secret: 'docker_password' },
spec: './manifest.tmpl', spec: 'manifest.tmpl',
},
when: {
status: [
'success',
],
}, },
}, },
{ {
@ -106,19 +116,27 @@ local PipelineNotifications(depends_on=[]) = {
README_PATH: 'README.md', README_PATH: 'README.md',
SHORT_DESCRIPTION: 'Rootless Bitwarden_RS - Self-hosted password manager', SHORT_DESCRIPTION: 'Rootless Bitwarden_RS - Self-hosted password manager',
}, },
when: {
status: [
'success',
],
},
}, },
{ {
image: 'plugins/matrix',
name: 'matrix', name: 'matrix',
image: 'plugins/matrix',
settings: { settings: {
homeserver: 'https://matrix.rknet.org', homeserver: { from_secret: 'matrix_homeserver' },
roomid: 'MtidqQXWWAtQcByBhH:rknet.org', roomid: { from_secret: 'matrix_roomid' },
template: 'Status: **{{ build.status }}**<br/> Build: [{{ repo.Owner }}/{{ repo.Name }}]({{ build.link }}) ({{ build.branch }}) by {{ build.author }}<br/> Message: {{ build.message }}', template: 'Status: **{{ build.status }}**<br/> Build: [{{ repo.Owner }}/{{ repo.Name }}]({{ build.link }}) ({{ build.branch }}) by {{ build.author }}<br/> Message: {{ build.message }}',
username: { from_secret: 'matrix_username' }, username: { from_secret: 'matrix_username' },
password: { from_secret: 'matrix_password' }, password: { from_secret: 'matrix_password' },
}, },
when: { when: {
status: ['success', 'failure'], status: [
'success',
'failure',
],
}, },
}, },
], ],
@ -127,7 +145,10 @@ local PipelineNotifications(depends_on=[]) = {
'refs/heads/master', 'refs/heads/master',
'refs/tags/**', 'refs/tags/**',
], ],
status: ['success', 'failure'], status: [
'success',
'failure',
],
}, },
depends_on: depends_on, depends_on: depends_on,
}; };

View File

@ -25,7 +25,7 @@ steps:
- name: dryrun - name: dryrun
image: plugins/docker:linux-amd64 image: plugins/docker:linux-amd64
settings: settings:
dockerfile: ./Dockerfile.amd64 dockerfile: Dockerfile.amd64
dry_run: true dry_run: true
password: password:
from_secret: docker_password from_secret: docker_password
@ -41,7 +41,7 @@ steps:
settings: settings:
auto_tag: true auto_tag: true
auto_tag_suffix: amd64 auto_tag_suffix: amd64
dockerfile: ./Dockerfile.amd64 dockerfile: Dockerfile.amd64
password: password:
from_secret: docker_password from_secret: docker_password
repo: xoxys/bitwardenrs_ldap repo: xoxys/bitwardenrs_ldap
@ -80,7 +80,7 @@ steps:
ignore_missing: true ignore_missing: true
password: password:
from_secret: docker_password from_secret: docker_password
spec: ./manifest.tmpl spec: manifest.tmpl
tags: tags:
- ${DRONE_TAG} - ${DRONE_TAG}
- ${DRONE_TAG%-*} - ${DRONE_TAG%-*}
@ -88,6 +88,9 @@ steps:
- ${DRONE_TAG%%.*} - ${DRONE_TAG%%.*}
username: username:
from_secret: docker_username from_secret: docker_username
when:
status:
- success
- name: readme - name: readme
image: sheogorath/readme-to-dockerhub image: sheogorath/readme-to-dockerhub
@ -100,14 +103,19 @@ steps:
from_secret: docker_username from_secret: docker_username
README_PATH: README.md README_PATH: README.md
SHORT_DESCRIPTION: Rootless Bitwarden_RS - Self-hosted password manager SHORT_DESCRIPTION: Rootless Bitwarden_RS - Self-hosted password manager
when:
status:
- success
- name: matrix - name: matrix
image: plugins/matrix image: plugins/matrix
settings: settings:
homeserver: https://matrix.rknet.org homeserver:
from_secret: matrix_homeserver
password: password:
from_secret: matrix_password from_secret: matrix_password
roomid: MtidqQXWWAtQcByBhH:rknet.org roomid:
from_secret: matrix_roomid
template: "Status: **{{ build.status }}**<br/> Build: [{{ repo.Owner }}/{{ repo.Name }}]({{ build.link }}) ({{ build.branch }}) by {{ build.author }}<br/> Message: {{ build.message }}" template: "Status: **{{ build.status }}**<br/> Build: [{{ repo.Owner }}/{{ repo.Name }}]({{ build.link }}) ({{ build.branch }}) by {{ build.author }}<br/> Message: {{ build.message }}"
username: username:
from_secret: matrix_username from_secret: matrix_username
@ -129,6 +137,6 @@ depends_on:
--- ---
kind: signature kind: signature
hmac: 7d0047e966a281c570b76b36a741bfe660682662a09bc6c6ebc12fda7d18f951 hmac: 25ce75557a40f6bc5b28e6cd1bfd8be018ccd81b72e9012da9bb04e7325f9330
... ...