From 033f0a0930ad7f8076e855f5c2b2e23e0f8df86c Mon Sep 17 00:00:00 2001
From: Hans van Essen <Expaso@users.noreply.github.com>
Date: Sun, 16 Jul 2023 15:57:27 +0200
Subject: [PATCH] - Fixed an issue with pgAgent not updating job status - Made
 upgrade more resilient when timesdcaledb-extras are installed

---
 .github/release-drafter.yml                           | 6 +++---
 .github/workflows/cd.yml                              | 3 ++-
 timescaledb/Dockerfile                                | 5 +++++
 timescaledb/rootfs/etc/s6-overlay/s6-rc.d/pgagent/run | 2 +-
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml
index afa0319..e2706f4 100644
--- a/.github/release-drafter.yml
+++ b/.github/release-drafter.yml
@@ -1,7 +1,7 @@
-name-template: 'v$NEXT_PATCH_VERSION 🌈'
+name-template: 'v$NEXT_PATCH_VERSION'
 tag-template: 'v$NEXT_PATCH_VERSION'
 categories:
-  - title: '🎉 Features'
+  - title: '🚀 Features'
     labels:
       - 'feature'
       - 'enhancement'
@@ -17,4 +17,4 @@ categories:
       - 'upgrade'
 change-template: '- $TITLE @$AUTHOR (#$NUMBER)'
 template: |
-  $CHANGES
\ No newline at end of file
+  $CHANGES
diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
index b6810d9..fc4175b 100644
--- a/.github/workflows/cd.yml
+++ b/.github/workflows/cd.yml
@@ -4,10 +4,11 @@ on:
       types: 
         - released
         - created
+        - prereleased
 
 jobs:
   build:
-    if: github.event.action == 'created'
+    if: github.event.action == 'created' || github.event.action == 'prereleased'
     name: Build image
     runs-on: ubuntu-latest
     steps:
diff --git a/timescaledb/Dockerfile b/timescaledb/Dockerfile
index 9c59d9d..91ff21d 100644
--- a/timescaledb/Dockerfile
+++ b/timescaledb/Dockerfile
@@ -7,6 +7,11 @@ ARG GO_VERSION=1.19.0
 ###########################################
 FROM $BUILD_FROM as addon-base
 
+RUN sed -i "s/libcrypto3=3.1.1-r1/libcrypto3=3.1.1-r2/g" /etc/apk/world \
+    && sed -i "s/libssl3=3.1.1-r1/libssl3=3.1.1-r2/g" /etc/apk/world \
+    && apk update \
+    && apk upgrade
+
 ####################################
 # Previous Addon Image
 ####################################
diff --git a/timescaledb/rootfs/etc/s6-overlay/s6-rc.d/pgagent/run b/timescaledb/rootfs/etc/s6-overlay/s6-rc.d/pgagent/run
index f1161e6..47e0c37 100755
--- a/timescaledb/rootfs/etc/s6-overlay/s6-rc.d/pgagent/run
+++ b/timescaledb/rootfs/etc/s6-overlay/s6-rc.d/pgagent/run
@@ -42,4 +42,4 @@ export TMPDIR=/data/tmp/pgagent
 
 # And run the daemon in the foreground
 bashio::log.info "Starting PgAgent.."
-/usr/local/bin/pgagent hostaddr=127.0.0.1 dbname=postgres user=postgres -f
+/usr/local/bin/pgagent hostaddr=127.0.0.1 dbname=postgres user=postgres -f -s /var/log/pgagent