Merge branch 'release/v12.13-1'

Author: cbeyer42

CHANGELOG.md

@@ -7,6 +7,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [v12.13-1] - 2023-02-06
+### Changed
+- Upgrades PostgreSQL to 12.13 (#15)
+  - This update contains several security fixes
+- Update base image to 3.17.1-1 (#15)
+- Set healthcheck interval to 5 seconds
+
 ## [v12.10-1] - 2022-04-06
 ### Changed
 - Upgrades PostgreSQL to 12.10

Dockerfile

@@ -1,12 +1,12 @@
-FROM registry.cloudogu.com/official/base:3.12.4-2
+FROM registry.cloudogu.com/official/base:3.17.1-1
 
 LABEL NAME="official/postgresql" \
-        VERSION="12.10-1" \
+        VERSION="12.13-1" \
         maintainer="[email protected]"
 
 ENV LANG=en_US.utf8 \
     PGDATA=/var/lib/postgresql \
-    POSTGRESQL_VERSION=12.10-r0 \
+    POSTGRESQL_VERSION=12.13-r1 \
     GOSU_SHA256=0f25a21cf64e58078057adc78f38705163c1d564a959ff30a891c31917011a54
 
 # install postgresql and gosu
@@ -17,7 +17,7 @@ RUN set -x -o errexit \
  && set -o pipefail \
  && apk update \
  && apk upgrade \
- && apk add --update postgresql="${POSTGRESQL_VERSION}" \
+ && apk add --update postgresql12="${POSTGRESQL_VERSION}" \
  && wget --progress=bar:force:noscroll "https://github.com/tianon/gosu/releases/download/1.12/gosu-amd64" \
  && echo "${GOSU_SHA256} *gosu-amd64" | sha256sum -c - \
  && mv /gosu-amd64 /usr/local/bin/gosu \
@@ -28,7 +28,7 @@ COPY resources/ /
 
 VOLUME ["/var/lib/postgresql"]
 
-HEALTHCHECK CMD doguctl healthy postgresql || exit 1
+HEALTHCHECK --interval=5s CMD doguctl healthy postgresql || exit 1
 
 EXPOSE 5432
 

Jenkinsfile

@@ -29,7 +29,12 @@ node('vagrant') {
             // Keep only the last x builds to preserve space
             buildDiscarder(logRotator(numToKeepStr: '10')),
             // Don't run concurrent builds for a branch, because they use the same workspace directory
-            disableConcurrentBuilds()
+            disableConcurrentBuilds(),
+            // Parameter to activate dogu upgrade test on demand
+            parameters([
+                    booleanParam(defaultValue: false, description: 'Test dogu upgrade from latest release or optionally from defined version below', name: 'TestDoguUpgrade'),
+                    string(defaultValue: '', description: 'Old Dogu version for the upgrade test (optional; e.g. 4.1.0-3)', name: 'OldDoguVersionForUpgradeTest'),
+            ])
         ])
 
         EcoSystem ecoSystem = new EcoSystem(this, 'gcloud-ces-operations-internal-packer', 'jenkins-gcloud-ces-operations-internal')
@@ -59,6 +64,16 @@ node('vagrant') {
                 ecoSystem.verify(doguDirectory)
             }
 
+            if (params.TestDoguUpgrade != null && params.TestDoguUpgrade){
+                stage('Upgrade dogu'){
+                    ecoSystem.upgradeFromPreviousRelease(params.OldDoguVersionForUpgradeTest, doguName)
+                }
+
+                stage('Verify - after upgrade') {
+                    ecoSystem.verify(doguDirectory)
+                }
+            }
+
             if (gitflow.isReleaseBranch()) {
                 String releaseVersion = git.getSimpleBranchName()
 

dogu.json

@@ -1,6 +1,6 @@
 {
   "Name": "official/postgresql",
-  "Version": "12.10-1",
+  "Version": "12.13-1",
   "DisplayName": "PostgreSQL",
   "Description": "PostgreSQL Database.",
   "Url": "https://www.postgresql.org/",

spec/goss/goss.yaml

@@ -39,7 +39,7 @@ file:
     owner: postgres
     filetype: directory
 package:
-  postgresql:
+  postgresql12:
     installed: true
 port:
   tcp:5432: