From 796ef43f30d75e0255ecc7e8cd1cf9e6d85072d9 Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Mon, 4 May 2020 20:53:36 +0200 Subject: [PATCH] cleanup --- .drone.jsonnet | 148 --------------------------------------------- .drone.yml | 18 ++++-- CHANGELOG.md | 4 +- README.md | 2 +- docker-compose.yml | 2 +- manifest.tmpl | 15 ----- 6 files changed, 18 insertions(+), 171 deletions(-) delete mode 100644 .drone.jsonnet delete mode 100644 manifest.tmpl diff --git a/.drone.jsonnet b/.drone.jsonnet deleted file mode 100644 index 3cee092..0000000 --- a/.drone.jsonnet +++ /dev/null @@ -1,148 +0,0 @@ -local PipelineBuild(arch='amd64') = { - kind: 'pipeline', - name: 'build-' + arch, - platform: { - os: 'linux', - arch: arch, - }, - steps: [ - { - name: 'dryrun', - image: 'plugins/docker', - settings: { - dry_run: true, - dockerfile: 'Dockerfile', - repo: 'xoxys/${DRONE_REPO_NAME}', - username: { from_secret: 'docker_username' }, - password: { from_secret: 'docker_password' }, - build_args: [ - 'BUILD_VERSION=${DRONE_TAG%-*}', - ], - }, - when: { - ref: [ - 'refs/pull/**', - ], - }, - }, - { - name: 'publish', - image: 'plugins/docker', - settings: { - auto_tag: true, - auto_tag_suffix: arch, - dockerfile: 'Dockerfile', - repo: 'xoxys/${DRONE_REPO_NAME}', - username: { from_secret: 'docker_username' }, - password: { from_secret: 'docker_password' }, - build_args: [ - 'BUILD_VERSION=${DRONE_TAG%-*}', - ], - }, - when: { - ref: [ - 'refs/heads/master', - 'refs/tags/**', - ], - }, - }, - { - name: 'publish-gitea', - image: 'plugins/gitea-release', - settings: { - api_key: { from_secret: 'gitea_token' }, - base_url: 'https://gitea.rknet.org', - overwrite: true, - title: '${DRONE_TAG}', - note: 'CHANGELOG.md', - }, - when: { - ref: ['refs/tags/**'], - }, - }, - ], -}; - -local PipelineNotifications(depends_on=[]) = { - kind: 'pipeline', - name: 'notifications', - platform: { - os: 'linux', - arch: 'amd64', - }, - steps: [ - { - image: 'plugins/manifest', - name: 'manifest', - settings: { - ignore_missing: true, - tags: [ - '${DRONE_TAG}', - '${DRONE_TAG%-*}', - '${DRONE_TAG%.*}', - '${DRONE_TAG%%.*}', - ], - username: { from_secret: 'docker_username' }, - password: { from_secret: 'docker_password' }, - spec: 'manifest.tmpl', - }, - when: { - status: [ - 'success', - ], - }, - }, - { - name: 'readme', - image: 'sheogorath/readme-to-dockerhub', - environment: { - DOCKERHUB_USERNAME: { from_secret: 'docker_username' }, - DOCKERHUB_PASSWORD: { from_secret: 'docker_password' }, - DOCKERHUB_REPO_PREFIX: 'xoxys', - DOCKERHUB_REPO_NAME: '${DRONE_REPO_NAME}', - README_PATH: 'README.md', - SHORT_DESCRIPTION: 'Rootless Kanboard - Kanban project management software', - }, - when: { - status: [ - 'success', - ], - }, - }, - { - name: 'matrix', - image: 'plugins/matrix', - settings: { - 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', - ], - }, - }, - ], - trigger: { - ref: [ - 'refs/heads/master', - 'refs/tags/**', - ], - status: [ - 'success', - 'failure', - ], - }, - depends_on: depends_on, -}; - -[ - PipelineBuild(arch='amd64'), - PipelineNotifications(depends_on=[ - 'build-amd64', - ]), -] diff --git a/.drone.yml b/.drone.yml index f5bef54..7a8bcb1 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,6 +1,6 @@ --- kind: pipeline -name: build-amd64 +name: build-container platform: os: linux @@ -23,11 +23,21 @@ steps: ref: - refs/pull/** +- name: tags + image: xoxys/docker-autotag + environment: + DOCKER_AUTOTAG_FORCE_LATEST: True + DOCKER_AUTOTAG_IGNORE_PRERELEASE: True + DOCKER_AUTOTAG_OUTPUT_FILE: .tags + DOCKER_AUTOTAG_VERSION: ${DRONE_TAG} + when: + ref: + - refs/heads/master + - refs/tags/** + - name: publish image: plugins/docker settings: - auto_tag: true - auto_tag_suffix: amd64 build_args: - BUILD_VERSION=${DRONE_TAG%-*} dockerfile: Dockerfile @@ -122,7 +132,7 @@ trigger: - failure depends_on: -- build-amd64 +- build-container --- kind: signature diff --git a/CHANGELOG.md b/CHANGELOG.md index 36343c7..ab7a86a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,2 +1,2 @@ -* ENHANCEMENT - * update to upstream v1.2.14 +* INTERNAL + * simplify repo structure and ci diff --git a/README.md b/README.md index 77fdcbf..3dce673 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ Compatible with docker-compose v2 schemas. ```Yaml --- -version: '2.1' +version: '3' services: kanboard: diff --git a/docker-compose.yml b/docker-compose.yml index 65b8a04..5b10dd7 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,5 +1,5 @@ --- -version: '2.1' +version: '3' services: kanboard: diff --git a/manifest.tmpl b/manifest.tmpl deleted file mode 100644 index 61a7040..0000000 --- a/manifest.tmpl +++ /dev/null @@ -1,15 +0,0 @@ -image: xoxys/kanboard:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}} -{{#if build.tags}} -tags: -{{#each build.tags}} - {{#if this}} - - {{trimPrefix "v" this}} - - {{trimPrefix "v" this}}-amd64 - {{/if}} -{{/each}} -{{/if}} -manifests: - - image: xoxys/kanboard:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}amd64 - platform: - architecture: amd64 - os: linux