From 0e9c4a7ffc8f842683641b0f921887a97d74cefa Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Mon, 4 May 2020 21:04:19 +0200 Subject: [PATCH] cleanup --- .drone.jsonnet | 144 ------------------------------------------------- .drone.yml | 38 ++++++------- manifest.tmpl | 15 ------ 3 files changed, 15 insertions(+), 182 deletions(-) delete mode 100644 .drone.jsonnet delete mode 100644 manifest.tmpl diff --git a/.drone.jsonnet b/.drone.jsonnet deleted file mode 100644 index 7a0d6bb..0000000 --- a/.drone.jsonnet +++ /dev/null @@ -1,144 +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: [], - }, - 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: [], - }, - 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 NGINX - High-performance HTTP server and reverse proxy', - }, - 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 a2196b1..f735177 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,6 +1,6 @@ --- kind: pipeline -name: build-amd64 +name: build-container platform: os: linux @@ -21,11 +21,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 dockerfile: Dockerfile password: from_secret: docker_password @@ -59,24 +69,6 @@ platform: arch: amd64 steps: -- name: manifest - image: plugins/manifest - settings: - ignore_missing: true - password: - from_secret: docker_password - spec: manifest.tmpl - tags: - - ${DRONE_TAG} - - ${DRONE_TAG%-*} - - ${DRONE_TAG%.*} - - ${DRONE_TAG%%.*} - username: - from_secret: docker_username - when: - status: - - success - - name: readme image: sheogorath/readme-to-dockerhub environment: @@ -118,10 +110,10 @@ trigger: - failure depends_on: -- build-amd64 +- build-container --- kind: signature -hmac: 58628427cc7d49043cf825e1419f8132b47ac392a79aac3a19056273dc517915 +hmac: 017127701f2d92b22bb9b6fa17648ab90343aa2db25da28417282d55d767958b ... diff --git a/manifest.tmpl b/manifest.tmpl deleted file mode 100644 index ff0383e..0000000 --- a/manifest.tmpl +++ /dev/null @@ -1,15 +0,0 @@ -image: xoxys/nginx:{{#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/nginx:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}amd64 - platform: - architecture: amd64 - os: linux