From 766a5408e799a13c4e1d7e1525d0d1bbf06c2e25 Mon Sep 17 00:00:00 2001 From: Laurin Friebe Date: Wed, 6 Nov 2024 09:38:45 +0100 Subject: [PATCH 1/6] [#40] update postgresql version to 14.13 --- CHANGELOG.md | 2 ++ Dockerfile | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 53169c1..044307a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] +### Changed +- [#40] Update postgresql to v14.13 ## [v14.12-4] - 2024-10-11 ### Added diff --git a/Dockerfile b/Dockerfile index 62fcc93..5a3d1df 100644 --- a/Dockerfile +++ b/Dockerfile @@ -23,7 +23,7 @@ LABEL NAME="official/postgresql" \ ENV LANG=en_US.utf8 \ PGDATA=/var/lib/postgresql \ - POSTGRESQL_VERSION=14.12-r0 + POSTGRESQL_VERSION=14.13-r0 RUN set -x -o errexit \ && set -o nounset \ From c27d9477a56d5957921cdb0fd22ad01e4aa86d9b Mon Sep 17 00:00:00 2001 From: Laurin Friebe Date: Wed, 6 Nov 2024 11:21:18 +0100 Subject: [PATCH 2/6] [#40] update dogu-build-lib; add .trivyignore --- .trivyignore | 7 +++++++ Jenkinsfile | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 .trivyignore diff --git a/.trivyignore b/.trivyignore new file mode 100644 index 0000000..445f4bf --- /dev/null +++ b/.trivyignore @@ -0,0 +1,7 @@ +// The following CVEs are reported by the trivy scan of the gosu library +// gosu explicitly states to use their own vulnerability checker which is based on govulncheck +// see https://github.com/tianon/gosu/blob/master/SECURITY.md +// govulncheck does not report these CVEs as actual vulnerabilities in gosu +CVE-2023-24538 +CVE-2023-24540 +CVE-2024-24790 \ No newline at end of file diff --git a/Jenkinsfile b/Jenkinsfile index 71d7792..aa146f7 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,5 +1,5 @@ #!groovy -@Library(['github.com/cloudogu/ces-build-lib@2.2.1', 'github.com/cloudogu/dogu-build-lib@v2.3.1']) +@Library(['github.com/cloudogu/ces-build-lib@2.2.1', 'github.com/cloudogu/dogu-build-lib@v2.5.0']) import com.cloudogu.ces.cesbuildlib.* import com.cloudogu.ces.dogubuildlib.* From f6ae01d010a621239eb2bf6e6539589b479b134a Mon Sep 17 00:00:00 2001 From: Marco Bergen Date: Wed, 13 Nov 2024 13:30:54 +0100 Subject: [PATCH 3/6] [40] remove unnecessary files --- docs/gui/releasenotes_de.md | 8 -------- docs/gui/releasenotes_en.md | 8 -------- 2 files changed, 16 deletions(-) delete mode 100644 docs/gui/releasenotes_de.md delete mode 100644 docs/gui/releasenotes_en.md diff --git a/docs/gui/releasenotes_de.md b/docs/gui/releasenotes_de.md deleted file mode 100644 index e7d7c67..0000000 --- a/docs/gui/releasenotes_de.md +++ /dev/null @@ -1,8 +0,0 @@ -# Release Notes - -Im Folgenden finden Sie die Release Notes für das Postgresql-Dogu. - -Technische Details zu einem Release finden Sie im zugehörigen [Changelog](https://docs.cloudogu.com/de/docs/dogus/postgresql/CHANGELOG/). - -## Release 14.12-3 -- Die Cloudogu-eigenen Quellen werden von der MIT-Lizenz auf die AGPL-3.0-only relizensiert. \ No newline at end of file diff --git a/docs/gui/releasenotes_en.md b/docs/gui/releasenotes_en.md deleted file mode 100644 index dafe2f0..0000000 --- a/docs/gui/releasenotes_en.md +++ /dev/null @@ -1,8 +0,0 @@ -# Release Notes - -Below you will find the release notes for the Postgresql-Dogu. - -Technical details on a release can be found in the corresponding [Changelog](https://docs.cloudogu.com/de/docs/dogus/postgresql/CHANGELOG/). - -## Release 14.12-3 -- Relicense own code to AGPL-3.0-only \ No newline at end of file From 464bd9c379253df6ed09b2ce53780c1632221ff7 Mon Sep 17 00:00:00 2001 From: Benjamin Ernst Date: Wed, 13 Nov 2024 14:42:47 +0100 Subject: [PATCH 4/6] Bump version --- Dockerfile | 2 +- dogu.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 5a3d1df..19d354e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,7 +18,7 @@ RUN set -x -o errexit \ FROM registry.cloudogu.com/official/base:3.20.2-1 LABEL NAME="official/postgresql" \ - VERSION="14.12-4" \ + VERSION="14.13-1" \ maintainer="hello@cloudogu.com" ENV LANG=en_US.utf8 \ diff --git a/dogu.json b/dogu.json index c757bbf..a35c78f 100644 --- a/dogu.json +++ b/dogu.json @@ -1,6 +1,6 @@ { "Name": "official/postgresql", - "Version": "14.12-4", + "Version": "14.13-1", "DisplayName": "PostgreSQL", "Description": "PostgreSQL Database.", "Url": "https://www.postgresql.org/", From 1cb38b339bb1dc71d3ae465b526a23b485702494 Mon Sep 17 00:00:00 2001 From: Benjamin Ernst Date: Wed, 13 Nov 2024 14:42:58 +0100 Subject: [PATCH 5/6] Update changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 044307a..5589dcc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] + +## [v14.13-1] - 2024-11-13 ### Changed - [#40] Update postgresql to v14.13 From d6e81d5e789d300d935a1923bb49982b9f2e54b7 Mon Sep 17 00:00:00 2001 From: Benjamin Ernst Date: Wed, 13 Nov 2024 14:56:34 +0100 Subject: [PATCH 6/6] keep docs/gui for release --- docs/gui/.gitkeep | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 docs/gui/.gitkeep diff --git a/docs/gui/.gitkeep b/docs/gui/.gitkeep new file mode 100644 index 0000000..e69de29