diff --git a/.drone.jsonnet b/.drone.jsonnet
index 5f9479d..3696eb8 100644
--- a/.drone.jsonnet
+++ b/.drone.jsonnet
@@ -11,10 +11,10 @@ local PipelineBuild(arch='amd64') = {
name: 'binary',
image: 'clux/muslrust:nightly-2019-12-19',
environment: {
- 'DB': 'postgresql',
- 'DEBIAN_FRONTEND': 'noninteractive',
- 'LANG': 'C.UTF-8',
- 'TZ': 'UTC',
+ DB: 'postgresql',
+ DEBIAN_FRONTEND: 'noninteractive',
+ LANG: 'C.UTF-8',
+ TZ: 'UTC',
},
commands: [
'[ -z "${DRONE_TAG}" ] && LDAP_VERSION=master || LDAP_VERSION="${DRONE_TAG%-*}"',
@@ -30,7 +30,7 @@ local PipelineBuild(arch='amd64') = {
image: 'plugins/docker:' + tag,
settings: {
dry_run: true,
- dockerfile: './Dockerfile.' + arch,
+ dockerfile: 'Dockerfile.' + arch,
repo: 'xoxys/bitwardenrs_ldap',
username: { from_secret: 'docker_username' },
password: { from_secret: 'docker_password' },
@@ -47,7 +47,7 @@ local PipelineBuild(arch='amd64') = {
settings: {
auto_tag: true,
auto_tag_suffix: arch,
- dockerfile: './Dockerfile.' + arch,
+ dockerfile: 'Dockerfile.' + arch,
repo: 'xoxys/bitwardenrs_ldap',
username: { from_secret: 'docker_username' },
password: { from_secret: 'docker_password' },
@@ -89,10 +89,20 @@ local PipelineNotifications(depends_on=[]) = {
name: 'manifest',
settings: {
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' },
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',
SHORT_DESCRIPTION: 'Rootless Bitwarden_RS - Self-hosted password manager',
},
+ when: {
+ status: [
+ 'success',
+ ],
+ },
},
{
- image: 'plugins/matrix',
name: 'matrix',
+ image: 'plugins/matrix',
settings: {
- homeserver: 'https://matrix.rknet.org',
- roomid: 'MtidqQXWWAtQcByBhH:rknet.org',
+ homeserver: { from_secret: 'matrix_homeserver' },
+ roomid: { from_secret: 'matrix_roomid' },
template: 'Status: **{{ build.status }}**
Build: [{{ repo.Owner }}/{{ repo.Name }}]({{ build.link }}) ({{ build.branch }}) by {{ build.author }}
Message: {{ build.message }}',
username: { from_secret: 'matrix_username' },
password: { from_secret: 'matrix_password' },
},
when: {
- status: ['success', 'failure'],
+ status: [
+ 'success',
+ 'failure',
+ ],
},
},
],
@@ -127,7 +145,10 @@ local PipelineNotifications(depends_on=[]) = {
'refs/heads/master',
'refs/tags/**',
],
- status: ['success', 'failure'],
+ status: [
+ 'success',
+ 'failure',
+ ],
},
depends_on: depends_on,
};
diff --git a/.drone.yml b/.drone.yml
index 772636c..774b9e9 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -25,7 +25,7 @@ steps:
- name: dryrun
image: plugins/docker:linux-amd64
settings:
- dockerfile: ./Dockerfile.amd64
+ dockerfile: Dockerfile.amd64
dry_run: true
password:
from_secret: docker_password
@@ -41,7 +41,7 @@ steps:
settings:
auto_tag: true
auto_tag_suffix: amd64
- dockerfile: ./Dockerfile.amd64
+ dockerfile: Dockerfile.amd64
password:
from_secret: docker_password
repo: xoxys/bitwardenrs_ldap
@@ -80,7 +80,7 @@ steps:
ignore_missing: true
password:
from_secret: docker_password
- spec: ./manifest.tmpl
+ spec: manifest.tmpl
tags:
- ${DRONE_TAG}
- ${DRONE_TAG%-*}
@@ -88,6 +88,9 @@ steps:
- ${DRONE_TAG%%.*}
username:
from_secret: docker_username
+ when:
+ status:
+ - success
- name: readme
image: sheogorath/readme-to-dockerhub
@@ -100,14 +103,19 @@ steps:
from_secret: docker_username
README_PATH: README.md
SHORT_DESCRIPTION: Rootless Bitwarden_RS - Self-hosted password manager
+ when:
+ status:
+ - success
- name: matrix
image: plugins/matrix
settings:
- homeserver: https://matrix.rknet.org
+ homeserver:
+ from_secret: matrix_homeserver
password:
from_secret: matrix_password
- roomid: MtidqQXWWAtQcByBhH:rknet.org
+ roomid:
+ from_secret: matrix_roomid
template: "Status: **{{ build.status }}**
Build: [{{ repo.Owner }}/{{ repo.Name }}]({{ build.link }}) ({{ build.branch }}) by {{ build.author }}
Message: {{ build.message }}"
username:
from_secret: matrix_username
@@ -129,6 +137,6 @@ depends_on:
---
kind: signature
-hmac: 7d0047e966a281c570b76b36a741bfe660682662a09bc6c6ebc12fda7d18f951
+hmac: 25ce75557a40f6bc5b28e6cd1bfd8be018ccd81b72e9012da9bb04e7325f9330
...