.chglog/CHANGELOG.tpl.md

@@ -6,14 +6,10 @@
 {{ range .CommitGroups -}}
 ### {{ .Title }}
 
-{{ $subjects := list }}
 {{ range .Commits -}}
-{{ if not (has .Subject $subjects) -}}
 - {{ if .Scope }}**{{ .Scope }}:** {{ end }}{{ .Subject }}
-{{ $subjects = append $subjects .Subject -}}
 {{ end }}
-{{- end }}
-{{- end -}}
+{{ end -}}
 
 {{- if .NoteGroups -}}
 {{ range .NoteGroups -}}

.drone.yml

@@ -57,22 +57,15 @@ steps:
   depends_on:
   - dryrun
 
-- name: changelog-generate
+- name: changelog
   image: thegeeklab/git-chglog
   commands:
   - git fetch -tq
+  - git-chglog --no-color --no-emoji ${DRONE_TAG:---next-tag unreleased unreleased}
   - 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: publish-dockerhub
   image: thegeeklab/drone-docker-buildx:20
   settings:
@@ -89,7 +82,7 @@ steps:
     - refs/heads/main
     - refs/tags/**
   depends_on:
-  - changelog-format
+  - changelog
 
 - name: publish-quay
   image: thegeeklab/drone-docker-buildx:20
@@ -108,7 +101,7 @@ steps:
     - refs/heads/main
     - refs/tags/**
   depends_on:
-  - changelog-format
+  - changelog
 
 - name: publish-gitea
   image: plugins/gitea-release
@@ -201,6 +194,6 @@ depends_on:
 
 ---
 kind: signature
-hmac: b4bc5725b81af54f315d93f84f7c1097d02f5258277fc09e87d42029ed9539a0
+hmac: 437dfa2f62409201cf177477f26ea3a73659929fdb5096fd2e72c443725df191
 
 ...

.prettierignore

@@ -1,2 +1 @@
 .drone.yml
-*.tpl.md

Dockerfile

@@ -1,4 +1,4 @@
-FROM thegeeklab/nginx:latest@sha256:b87952e51d7e29439a23affa33301b82aede3c4c4a59a3ac1273b47f1fba6195
+FROM thegeeklab/nginx:latest@sha256:3a1afe8ca3ad14e5f64bb79531739c97346101cc7e2d56d07ed58ebc37bd29d5
 
 LABEL maintainer="Robert Kaussow <mail@thegeeklab.de>"
 LABEL org.opencontainers.image.authors="Robert Kaussow <mail@thegeeklab.de>"
@@ -9,7 +9,7 @@ LABEL org.opencontainers.image.documentation="https://gitea.rknet.org/docker/fre
 
 ARG BUILD_VERSION
 # renovate: datasource=github-releases depName=FreshRSS/FreshRSS
-ENV FRESHRSS_VERSION="${BUILD_VERSION:-1.18.1}"
+ENV FRESHRSS_VERSION="${BUILD_VERSION:-1.18.0}"
 
 ADD overlay/ /