From fd0851c56b25b51fe7ccd594440fd719ed424a8d Mon Sep 17 00:00:00 2001
From: Andy Pfister <andy.pfister@hey.com>
Date: Sat, 14 Dec 2024 03:19:37 +0100
Subject: [PATCH] Improve Renovate configuration (#72)

---
 .github/workflows/ci.yml |  9 +++++----
 Dockerfile.alpine        | 17 ++++++++++-------
 Dockerfile.bookworm      | 10 +++++-----
 renovate.json            |  3 ++-
 4 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4dff011..a3328b6 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -75,13 +75,14 @@ jobs:
         type=registry,ref=pgautoupgrade/pgautoupgrade:build-15-${{ matrix.operating_system.flavor }}
         type=registry,ref=pgautoupgrade/pgautoupgrade:build-16-${{ matrix.operating_system.flavor }}
         type=registry,ref=pgautoupgrade/pgautoupgrade:${{ matrix.pg_target }}-${{ matrix.operating_system.flavor }}
-        type=registry,ref=pgautoupgrade/pgautoupgrade:${{ matrix.pg_target }}-${{ matrix.operating_system.flavor }}${{ matrix.operating_system.version }}
+        type=registry,ref=pgautoupgrade/pgautoupgrade:${{ matrix.pg_target }}-${{ matrix.operating_system.flavor }}${{ matrix.operating_system.OS_VERSION }}
 
     strategy:
       matrix:
         operating_system:
           - flavor: "alpine"
-            version: "3.20"
+            # renovate: datasource=docker depName=alpine versioning=docker
+            OS_VERSION: "3.20"
           - flavor: "bookworm"
         pg_target:
           - "12"
@@ -112,7 +113,7 @@ jobs:
           load: true
           tags: |
             "pgautoupgrade/pgautoupgrade:${{ matrix.pg_target }}-${{ matrix.operating_system.flavor }}"
-            "pgautoupgrade/pgautoupgrade:${{ matrix.pg_target }}-${{ matrix.operating_system.flavor }}${{ matrix.operating_system.version }}"
+            "pgautoupgrade/pgautoupgrade:${{ matrix.pg_target }}-${{ matrix.operating_system.flavor }}${{ matrix.operating_system.OS_VERSION }}"
           build-args: |
             "PGTARGET=${{ matrix.pg_target }}"
           cache-to: type=inline
@@ -145,7 +146,7 @@ jobs:
           platforms: linux/amd64,linux/arm64
           tags: |
             "pgautoupgrade/pgautoupgrade:${{ matrix.pg_target }}-${{ matrix.operating_system.flavor }}"
-            "pgautoupgrade/pgautoupgrade:${{ matrix.pg_target }}-${{ matrix.operating_system.flavor }}${{ matrix.operating_system.version }}"
+            "pgautoupgrade/pgautoupgrade:${{ matrix.pg_target }}-${{ matrix.operating_system.flavor }}${{ matrix.operating_system.OS_VERSION }}"
           build-args: |
             "PGTARGET=${{ matrix.pg_target }}"
           push: true
diff --git a/Dockerfile.alpine b/Dockerfile.alpine
index 6b4e121..ed20fd7 100644
--- a/Dockerfile.alpine
+++ b/Dockerfile.alpine
@@ -1,7 +1,10 @@
 ARG PGTARGET=17
 
+# renovate: datasource=docker depName=alpine versioning=loose
+ARG ALPINE_VERSION=3.20
+
 ### Things we need in all build containers
-FROM alpine:3.20 AS base-build
+FROM alpine:${ALPINE_VERSION} AS base-build
 
 # The versions of PostgreSQL to use
 ENV PG95=9.5.25
@@ -9,19 +12,19 @@ ENV PG96=9.6.24
 ENV PG10=10.23
 ENV PG11=11.22
 
-# renovate: datasource=repology depName=macports/postgresql12-server versioning=loose
+# renovate: datasource=repology depName=homebrew/postgresql@12 versioning=loose
 ENV PG12_VERSION=12.22
 
-# renovate: datasource=repology depName=macports/postgresql13-server versioning=loose
+# renovate: datasource=repology depName=homebrew/postgresql@13 versioning=loose
 ENV PG13_VERSION=13.18
 
-# renovate: datasource=repology depName=macports/postgresql14-server versioning=loose
+# renovate: datasource=repology depName=homebrew/postgresql@14 versioning=loose
 ENV PG14_VERSION=14.15
 
-# renovate: datasource=repology depName=macports/postgresql15-server versioning=loose
+# renovate: datasource=repology depName=homebrew/postgresql@15 versioning=loose
 ENV PG15_VERSION=15.10
 
-# renovate: datasource=repology depName=macports/postgresql16-server versioning=loose
+# renovate: datasource=repology depName=homebrew/postgresql@16 versioning=loose
 ENV PG16_VERSION=16.6
 
 # Where we'll do all our compiling and similar
@@ -145,7 +148,7 @@ RUN cd postgresql-16.* && \
   rm -rf /usr/local-pg16/include
 
 # Use the PostgreSQL Alpine image as our output image base
-FROM postgres:${PGTARGET}-alpine3.20
+FROM postgres:${PGTARGET}-alpine${ALPINE_VERSION}
 
 # We need to define this here, to make the above PGTARGET available after the FROM
 ARG PGTARGET
diff --git a/Dockerfile.bookworm b/Dockerfile.bookworm
index 0ca39f7..f7d0b3d 100644
--- a/Dockerfile.bookworm
+++ b/Dockerfile.bookworm
@@ -9,19 +9,19 @@ ENV PG96=9.6.24
 ENV PG10=10.23
 ENV PG11=11.22
 
-# renovate: datasource=repology depName=macports/postgresql12-server versioning=loose
+# renovate: datasource=repology depName=homebrew/postgresql@12 versioning=loose
 ENV PG12_VERSION=12.22
 
-# renovate: datasource=repology depName=macports/postgresql13-server versioning=loose
+# renovate: datasource=repology depName=homebrew/postgresql@13 versioning=loose
 ENV PG13_VERSION=13.18
 
-# renovate: datasource=repology depName=macports/postgresql14-server versioning=loose
+# renovate: datasource=repology depName=homebrew/postgresql@14 versioning=loose
 ENV PG14_VERSION=14.15
 
-# renovate: datasource=repology depName=macports/postgresql15-server versioning=loose
+# renovate: datasource=repology depName=homebrew/postgresql@15 versioning=loose
 ENV PG15_VERSION=15.10
 
-# renovate: datasource=repology depName=macports/postgresql16-server versioning=loose
+# renovate: datasource=repology depName=homebrew/postgresql@16 versioning=loose
 ENV PG16_VERSION=16.6
 
 # Where we'll do all our compiling and similar
diff --git a/renovate.json b/renovate.json
index 0b293f6..236ec80 100644
--- a/renovate.json
+++ b/renovate.json
@@ -2,6 +2,7 @@
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
   "extends": [
     "config:recommended",
-    "customManagers:dockerfileVersions"
+    "customManagers:dockerfileVersions",
+    "customManagers:githubActionsVersions"
   ]
 }