3 changed files with 158 additions and 154 deletions
--- a/.chglog/CHANGELOG.tpl.md
+++ b/.chglog/CHANGELOG.tpl.md
@ -6,9 +6,13 @@
 {{ range .CommitGroups -}}
 ### {{ .Title }}

+{{ $subjects := list }}
 {{ range .Commits -}}
- {{ if .Scope }}**{{ .Scope }}:** {{ end }}{{ (regexReplaceAll "(Co-\\w*-by.*)" .Subject "") | trim }}
+{{ if not (has .Subject $subjects) -}}
+- {{ if .Scope }}**{{ .Scope }}:** {{ end }}{{ .Subject }}
+{{ $subjects = append $subjects .Subject -}}
 {{ end }}
+{{- end }}
 {{- end -}}

 {{- if .NoteGroups -}}
--- a/.drone.yml
+++ b/.drone.yml
@ -7,16 +7,16 @@ platform:
  arch: amd64

 steps:
-  - name: markdownlint
-    image: thegeeklab/markdownlint-cli
-    commands:
-      - markdownlint 'README.md'
+- name: markdownlint
+  image: thegeeklab/markdownlint-cli
+  commands:
+  - markdownlint 'README.md'

 trigger:
  ref:
-    - refs/heads/main
-    - refs/pull/**
-    - refs/tags/**
+  - refs/heads/main
+  - refs/pull/**
+  - refs/tags/**

 ---
 kind: pipeline
@ -27,113 +27,113 @@ platform:
  arch: amd64

 steps:
-  - name: dryrun
-    image: thegeeklab/drone-docker-buildx:20
-    settings:
-      build_args:
-        - BUILD_VERSION=${DRONE_TAG%-*}
-      dockerfile: Dockerfile
-      dry_run: true
-      password:
-        from_secret: docker_password
-      repo: thegeeklab/${DRONE_REPO_NAME}
-      username:
-        from_secret: docker_username
-    when:
-      ref:
-        - refs/pull/**
+- name: dryrun
+  image: thegeeklab/drone-docker-buildx:20
+  settings:
+    build_args:
+    - BUILD_VERSION=${DRONE_TAG%-*}
+    dockerfile: Dockerfile
+    dry_run: true
+    password:
+      from_secret: docker_password
+    repo: thegeeklab/${DRONE_REPO_NAME}
+    username:
+      from_secret: docker_username
+  when:
+    ref:
+    - refs/pull/**

-  - name: tags
-    image: thegeeklab/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/main
-        - refs/tags/**
-    depends_on:
-      - dryrun
+- name: tags
+  image: thegeeklab/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/main
+    - refs/tags/**
+  depends_on:
+  - dryrun

-  - name: changelog-generate
-    image: thegeeklab/git-chglog
-    commands:
-      - git fetch -tq
-      - git-chglog --no-color --no-emoji -o CHANGELOG.md ${DRONE_TAG:---next-tag unreleased unreleased}
-    depends_on:
-      - tags
+- name: changelog-generate
+  image: thegeeklab/git-chglog
+  commands:
+  - git fetch -tq
+  - git-chglog --no-color --no-emoji -o CHANGELOG.md ${DRONE_TAG:---next-tag unreleased unreleased}
+  depends_on:
+  - tags

-  - name: changelog-format
-    image: thegeeklab/alpine-tools
-    commands:
-      - prettier CHANGELOG.md
-      - prettier -w CHANGELOG.md
-    depends_on:
-      - changelog-generate
+- name: changelog-format
+  image: thegeeklab/alpine-tools
+  commands:
+  - prettier CHANGELOG.md
+  - prettier -w CHANGELOG.md
+  depends_on:
+  - changelog-generate

-  - name: publish-dockerhub
-    image: thegeeklab/drone-docker-buildx:20
-    settings:
-      build_args:
-        - BUILD_VERSION=${DRONE_TAG%-*}
-      dockerfile: Dockerfile
-      password:
-        from_secret: docker_password
-      repo: thegeeklab/${DRONE_REPO_NAME}
-      username:
-        from_secret: docker_username
-    when:
-      ref:
-        - refs/heads/main
-        - refs/tags/**
-    depends_on:
-      - changelog-format
+- name: publish-dockerhub
+  image: thegeeklab/drone-docker-buildx:20
+  settings:
+    build_args:
+    - BUILD_VERSION=${DRONE_TAG%-*}
+    dockerfile: Dockerfile
+    password:
+      from_secret: docker_password
+    repo: thegeeklab/${DRONE_REPO_NAME}
+    username:
+      from_secret: docker_username
+  when:
+    ref:
+    - refs/heads/main
+    - refs/tags/**
+  depends_on:
+  - changelog-format

-  - name: publish-quay
-    image: thegeeklab/drone-docker-buildx:20
-    settings:
-      build_args:
-        - BUILD_VERSION=${DRONE_TAG%-*}
-      dockerfile: Dockerfile
-      password:
-        from_secret: quay_password
-      registry: quay.io
-      repo: quay.io/thegeeklab/${DRONE_REPO_NAME}
-      username:
-        from_secret: quay_username
-    when:
-      ref:
-        - refs/heads/main
-        - refs/tags/**
-    depends_on:
-      - changelog-format
+- name: publish-quay
+  image: thegeeklab/drone-docker-buildx:20
+  settings:
+    build_args:
+    - BUILD_VERSION=${DRONE_TAG%-*}
+    dockerfile: Dockerfile
+    password:
+      from_secret: quay_password
+    registry: quay.io
+    repo: quay.io/thegeeklab/${DRONE_REPO_NAME}
+    username:
+      from_secret: quay_username
+  when:
+    ref:
+    - refs/heads/main
+    - refs/tags/**
+  depends_on:
+  - changelog-format

-  - name: publish-gitea
-    image: plugins/gitea-release
-    settings:
-      api_key:
-        from_secret: gitea_token
-      base_url: https://gitea.rknet.org
-      note: CHANGELOG.md
-      overwrite: true
-      title: ${DRONE_TAG}
-    when:
-      ref:
-        - refs/tags/**
-    depends_on:
-      - publish-dockerhub
-      - publish-quay
+- name: publish-gitea
+  image: plugins/gitea-release
+  settings:
+    api_key:
+      from_secret: gitea_token
+    base_url: https://gitea.rknet.org
+    note: CHANGELOG.md
+    overwrite: true
+    title: ${DRONE_TAG}
+  when:
+    ref:
+    - refs/tags/**
+  depends_on:
+  - publish-dockerhub
+  - publish-quay

 trigger:
  ref:
-    - refs/heads/main
-    - refs/pull/**
-    - refs/tags/**
+  - refs/heads/main
+  - refs/pull/**
+  - refs/tags/**

 depends_on:
-  - test
+- test

 ---
 kind: pipeline
@ -144,63 +144,63 @@ platform:
  arch: amd64

 steps:
-  - name: pushrm-dockerhub
-    pull: always
-    image: chko/docker-pushrm:1
-    environment:
-      DOCKER_PASS:
-        from_secret: docker_password
-      DOCKER_USER:
-        from_secret: docker_username
-      PUSHRM_FILE: README.md
-      PUSHRM_SHORT: Custom image for VNU Html Checker
-      PUSHRM_TARGET: thegeeklab/${DRONE_REPO_NAME}
-    when:
-      status:
-        - success
+- name: pushrm-dockerhub
+  pull: always
+  image: chko/docker-pushrm:1
+  environment:
+    DOCKER_PASS:
+      from_secret: docker_password
+    DOCKER_USER:
+      from_secret: docker_username
+    PUSHRM_FILE: README.md
+    PUSHRM_SHORT: Custom image for VNU Html Checker
+    PUSHRM_TARGET: thegeeklab/${DRONE_REPO_NAME}
+  when:
+    status:
+    - success

-  - name: pushrm-quay
-    pull: always
-    image: chko/docker-pushrm:1
-    environment:
-      APIKEY__QUAY_IO:
-        from_secret: quay_token
-      PUSHRM_FILE: README.md
-      PUSHRM_TARGET: quay.io/thegeeklab/${DRONE_REPO_NAME}
-    when:
-      status:
-        - success
+- name: pushrm-quay
+  pull: always
+  image: chko/docker-pushrm:1
+  environment:
+    APIKEY__QUAY_IO:
+      from_secret: quay_token
+    PUSHRM_FILE: README.md
+    PUSHRM_TARGET: quay.io/thegeeklab/${DRONE_REPO_NAME}
+  when:
+    status:
+    - success

-  - name: matrix
-    image: thegeeklab/drone-matrix
-    settings:
-      homeserver:
-        from_secret: matrix_homeserver
-      password:
-        from_secret: matrix_password
-      roomid:
-        from_secret: matrix_roomid
-      template: "Status: **{{ build.Status }}**<br/> Build: [{{ repo.Owner }}/{{ repo.Name }}]({{ build.Link }}){{#if build.Branch}} ({{ build.Branch }}){{/if}} by {{ commit.Author }}<br/> Message: {{ commit.Message.Title }}"
-      username:
-        from_secret: matrix_username
-    when:
-      status:
-        - success
-        - failure
-
-trigger:
-  ref:
-    - refs/heads/main
-    - refs/tags/**
-  status:
+- name: matrix
+  image: plugins/matrix
+  settings:
+    homeserver:
+      from_secret: matrix_homeserver
+    password:
+      from_secret: matrix_password
+    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 }}"
+    username:
+      from_secret: matrix_username
+  when:
+    status:
    - success
    - failure

+trigger:
+  ref:
+  - refs/heads/main
+  - refs/tags/**
+  status:
+  - success
+  - failure
+
 depends_on:
-  - build-container
+- build-container

 ---
 kind: signature
-hmac: b53aff5d318e0a58409e3ab437913a4f71c7ad3ad2f748d188a4dbcdac2df0ef
+hmac: dc637988ad9e93c35aee6647a831e613f118821b75a99b76655ca0e18661fa08

 ...
--- a/2
+++ b/2
@ -1,4 +1,4 @@
-FROM thegeeklab/alpine:latest@sha256:4361bc72c04bea35bb620d3641e73d7794246fac35b94e12049ba166d171d5bd
+FROM thegeeklab/alpine:latest@sha256:3de659c1a479d9d80e9c3924227981450af3a068087545a47360cfc2e70a91cc

 LABEL maintainer="Robert Kaussow <mail@thegeeklab.de>"
 LABEL org.opencontainers.image.authors="Robert Kaussow <mail@thegeeklab.de>"