From 21b39911613c5f24cf19bbfa830ff0009d938b68 Mon Sep 17 00:00:00 2001
From: mdasif <mdasif@obmondo.com>
Date: Wed, 3 Jun 2026 22:02:16 +0530
Subject: [PATCH] Schedule monthly automated builds for Ubuntu patch updates
 for backup-sealed-secrets and logical-backups

update image to resolute
---
 .../workflows/backup-sealed-secrets-keys.yml    |  7 ++++++-
 .github/workflows/postgres-logical-backup.yml   |  8 ++++++--
 backup-sealed-secrets-keys/Dockerfile           |  2 +-
 postgres-logical-backup/Dockerfile              | 17 +++++++++++------
 4 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/backup-sealed-secrets-keys.yml b/.github/workflows/backup-sealed-secrets-keys.yml
index 0b592315..c51cbbf2 100644
--- a/.github/workflows/backup-sealed-secrets-keys.yml
+++ b/.github/workflows/backup-sealed-secrets-keys.yml
@@ -1,6 +1,8 @@
 name: Build backup-sealed-secrets-keys
 
 on:
+  schedule:
+    - cron: '0 0 6 * *'
   push:
     branches: ["*"]
     paths: "backup-sealed-secrets-keys/**"
@@ -9,7 +11,9 @@ on:
 jobs:
   build-and-push:
     runs-on: ubuntu-latest
-
+    permissions:
+      contents: read
+      packages: write
     steps:
       - name: Checkout code
         uses: actions/checkout@v2
@@ -23,6 +27,7 @@ jobs:
         with:
           images: ghcr.io/obmondo/backup-sealed-secrets-keys
           tags: |
+            type=schedule,pattern={{date 'YY.M'}}.0
             type=ref,event=branch,enable=${{ !endsWith(github.ref, github.event.repository.default_branch) }}
             type=raw,value=latest,enable=${{ endsWith(github.ref, github.event.repository.default_branch) }}
             type=ref,event=tag
diff --git a/.github/workflows/postgres-logical-backup.yml b/.github/workflows/postgres-logical-backup.yml
index fa2f2dcd..d3d83999 100644
--- a/.github/workflows/postgres-logical-backup.yml
+++ b/.github/workflows/postgres-logical-backup.yml
@@ -1,6 +1,8 @@
 name: Build Logical backup
 
 on:
+  schedule:
+    - cron: '0 0 6 * *'
   push:
     branches: ["main"]
     paths:
@@ -10,7 +12,9 @@ on:
 jobs:
   build-and-push:
     runs-on: ubuntu-latest
-
+    permissions:
+      contents: read
+      packages: write
     steps:
       - name: Checkout code
         uses: actions/checkout@v2
@@ -24,8 +28,8 @@ jobs:
         with:
           images: ghcr.io/obmondo/postgres-logical-backup
           tags: |
+            type=schedule,pattern={{date 'YY.M'}}.0
             type=raw,value=latest
-            type=semver,pattern={{version}},value=v3.1.9
           flavor: |
             latest=false
       - name: Login to GitHub Container Registry
diff --git a/backup-sealed-secrets-keys/Dockerfile b/backup-sealed-secrets-keys/Dockerfile
index 576395dc..09fce2b5 100644
--- a/backup-sealed-secrets-keys/Dockerfile
+++ b/backup-sealed-secrets-keys/Dockerfile
@@ -1,7 +1,7 @@
 # Creator  David Darville - bw7
 # Maintainer Divyam Azad <nihaldivyam@gmail.com>
 # Start with Ubuntu LTS 22.04
-FROM ubuntu:jammy
+FROM ubuntu:resolute
 
 RUN apt-get update
 # Otherwise, the install requires keyboard interaction
diff --git a/postgres-logical-backup/Dockerfile b/postgres-logical-backup/Dockerfile
index 2d2cc5fd..74db6dd2 100644
--- a/postgres-logical-backup/Dockerfile
+++ b/postgres-logical-backup/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:jammy
+FROM ubuntu:resolute
 LABEL maintainer="Divyam Azad divyam@obmondo.com"
 
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
@@ -16,13 +16,18 @@ RUN apt-get update     \
         gnupg \
         gcc \
         libffi-dev \
+        unzip \
     && curl -sL https://aka.ms/InstallAzureCLIDeb | bash \
-    && pip3 install --upgrade pip \
-    && pip3 install --no-cache-dir awscli --upgrade \
-    && pip3 install --no-cache-dir gsutil --upgrade \
-    && echo "deb http://apt.postgresql.org/pub/repos/apt/ $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list \
+    && export CPU_ARCHITECTURE=$([ "$(uname -m)" = "x86_64" ] && echo "x86_64" || echo "aarch64") \
+    && curl -sSf "https://awscli.amazonaws.com/awscli-exe-linux-${CPU_ARCHITECTURE}.zip" -o /tmp/awscli.zip \
+    && unzip -q /tmp/awscli.zip -d /tmp \
+    && /tmp/aws/install \
+    && rm -rf /tmp/awscli.zip /tmp/aws \
+    && pip3 install --no-cache-dir --break-system-packages gsutil \
+    && mkdir -p /etc/apt/keyrings \
+    && curl --silent https://www.postgresql.org/media/keys/ACCC4CF8.asc | gpg --dearmor > /etc/apt/keyrings/pgdg.gpg \
+    && echo "deb [signed-by=/etc/apt/keyrings/pgdg.gpg] http://apt.postgresql.org/pub/repos/apt/ $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list \
     && cat /etc/apt/sources.list.d/pgdg.list \
-    && curl --silent https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - \
     && apt-get update \
     && apt-get install --no-install-recommends -y  \
         postgresql-client-18  \