feat: additional tags with minor pg version

This changes the pgedge image build process to produce new tags that
include the Postgres minor version. In order to keep the image
versioning scheme simple, we'll continue to increment the image
version, e.g. `4.0.10-4`, for minor postgres releases. Control Plane
will use the image tags that include the minor Postgres version so that
users can easily see it if they run `docker ps`.

Author: jason-lynch

docker-bake.hcl

@@ -1,32 +1,48 @@
 variable "IMAGE_REPO_HOST" {
-    default = "public.ecr.aws/k8c8c8g7"
+  default = "public.ecr.aws/k8c8c8g7"
 }
 
 variable "PGEDGE_REPO_BASE_URL" {
-    default = "http://pgedge-529820047909-yum.s3-website.us-east-2.amazonaws.com"
+  default = "http://pgedge-529820047909-yum.s3-website.us-east-2.amazonaws.com"
 }
 
 variable "PGEDGE_RELEASE_CHANNEL" {
-    default = "dev"
+  default = "dev"
 }
 
 function "pgedgeTag" {
-    params = [repo, pg_version, image_version]
-    result = ["${repo}:pg${pg_version}_${image_version}"]
+  params = [repo, pg_version, image_version]
+  result = [
+    "${repo}:pg${pg_version.major}_${image_version}",
+    "${repo}:pg${pg_version.major}.${pg_version.minor}_${image_version}",
+  ]
 }
 
 target "pgedge" {
   context = "docker/pgedge"
   matrix = {
-    pg_version = ["15", "16", "17"],
+    pg_version = [
+      {
+        major = "15"
+        minor = "13"
+      },
+      {
+        major = "16"
+        minor = "9"
+      },
+      {
+        major = "17"
+        minor = "5"
+      }
+    ],
     image_version = ["4.0.10-4"]
   }
-  name = replace("pgedge-${pg_version}-${image_version}", ".", "_")
+  name = replace("pgedge-${pg_version.major}-${image_version}", ".", "_")
   tags = pgedgeTag("${IMAGE_REPO_HOST}/pgedge", pg_version, image_version)
   args = {
     REPO_BASE_URL = PGEDGE_REPO_BASE_URL
     RELEASE_CHANNEL = PGEDGE_RELEASE_CHANNEL
-    POSTGRES_VERSION = pg_version
+    POSTGRES_VERSION = pg_version.major
     IMAGE_VERSION = image_version
   }
   platforms = [

docker/pgedge/CHANGELOG.md

@@ -8,15 +8,15 @@
 
 #### pg15 variant
 
-- Upgraded to PostgreSQL 15.13-1
+- Upgraded PostgreSQL to 15.13-1
 
 #### pg16 variant
 
-- Upgraded to PostgreSQL 16.9-1
+- Upgraded PostgreSQL to 16.9-1
 
 #### pg17 variant
 
-- Upgraded to PostgreSQL 17.5-1
+- Upgraded PostgreSQL to 17.5-1
 
 ## [4.0.10-3] - 2025-03-20
 

server/internal/orchestrator/swarm/orchestrator.go

@@ -129,11 +129,11 @@ func GetImages(cfg config.Config, version *host.PgEdgeVersion) (*Images, error)
 	var tag string
 	switch version.PostgresVersion.Major() {
 	case 17:
-		tag = "pgedge:pg17_4.0.10-4"
+		tag = "pgedge:pg17.5_4.0.10-4"
 	case 16:
-		tag = "pgedge:pg16_4.0.10-4"
+		tag = "pgedge:pg16.9_4.0.10-4"
 	case 15:
-		tag = "pgedge:pg15_4.0.10-4"
+		tag = "pgedge:pg15.13_4.0.10-4"
 	default:
 		return nil, fmt.Errorf("unsupported postgres version: %q", version.PostgresVersion)
 	}