diff --git a/.github/actions/generate-catalogs/catalogs_generator.py b/.github/actions/generate-catalogs/catalogs_generator.py index b6e643b4..951b5dca 100644 --- a/.github/actions/generate-catalogs/catalogs_generator.py +++ b/.github/actions/generate-catalogs/catalogs_generator.py @@ -28,7 +28,7 @@ from subprocess import check_output supported_img_types = ["minimal", "standard", "system"] -supported_os_names = ["bullseye", "bookworm", "trixie"] +supported_os_names = ["bookworm", "trixie"] min_supported_major = 13 default_registry = "ghcr.io/cloudnative-pg/postgresql" diff --git a/.github/workflows/catalogs.yml b/.github/workflows/catalogs.yml index 36e06208..b6956a0d 100644 --- a/.github/workflows/catalogs.yml +++ b/.github/workflows/catalogs.yml @@ -39,16 +39,14 @@ jobs: output-dir: artifacts/image-catalogs/ registry: ghcr.io/cloudnative-pg/postgresql family: postgresql - distributions: bullseye,bookworm,trixie + distributions: bookworm,trixie image-types: minimal,standard,system regex: '(\d+)(?:\.\d+|beta\d+|rc\d+|alpha\d+)-(\d{12})' # TODO: remove this step once system images are EOL - name: Update legacy catalogs run: | - cp artifacts/image-catalogs/catalog-system-bullseye.yaml postgres-containers/Debian/ClusterImageCatalog-bullseye.yaml cp artifacts/image-catalogs/catalog-system-bookworm.yaml postgres-containers/Debian/ClusterImageCatalog-bookworm.yaml - yq -i '.metadata.name = "postgresql"' postgres-containers/Debian/ClusterImageCatalog-bullseye.yaml yq -i '.metadata.name = "postgresql"' postgres-containers/Debian/ClusterImageCatalog-bookworm.yaml - name: Install cosign diff --git a/Debian/ClusterImageCatalog-bullseye.yaml b/Debian/ClusterImageCatalog-bullseye.yaml deleted file mode 100644 index 3c12948d..00000000 --- a/Debian/ClusterImageCatalog-bullseye.yaml +++ /dev/null @@ -1,24 +0,0 @@ -apiVersion: postgresql.cnpg.io/v1 -kind: ClusterImageCatalog -metadata: - name: postgresql - labels: - images.cnpg.io/family: postgresql - images.cnpg.io/type: system - images.cnpg.io/os: bullseye - images.cnpg.io/date: '20260831' - images.cnpg.io/publisher: cnpg.io -spec: - images: - - major: 13 - image: ghcr.io/cloudnative-pg/postgresql:13.22-202511100817-system-bullseye@sha256:bd12cfd185d2a5cb09ac51dd7c61cb7801da6250e8d9bd72d2891fcdedace32b - - major: 14 - image: ghcr.io/cloudnative-pg/postgresql:14.24-202608310817-system-bullseye@sha256:5480d5d9bd03762c4c8f33ebdf92973d689968ade2588b9d51710c5527b30d0b - - major: 15 - image: ghcr.io/cloudnative-pg/postgresql:15.19-202608310817-system-bullseye@sha256:11274300143f02d369ea2ff6082b028b6b662915f06bf59f26b808b53823475a - - major: 16 - image: ghcr.io/cloudnative-pg/postgresql:16.15-202608310817-system-bullseye@sha256:34cd4159d07b3410a1b29da35072e2e927a0905e717a61afa3814624a2e8859a - - major: 17 - image: ghcr.io/cloudnative-pg/postgresql:17.11-202608310816-system-bullseye@sha256:70664ebcfa1100361b5bdc28bbf06fdbe08db2dc4ad7bd14de33c5e05fe8ea8e - - major: 18 - image: ghcr.io/cloudnative-pg/postgresql:18.6-202608310817-system-bullseye@sha256:899d3ed526b659d77935dde0e6bf2d69dbbf17d3d8c6486ca8cfd04bd3c18533 diff --git a/Debian/ClusterImageCatalog-bullseye.yaml.sigstore.json b/Debian/ClusterImageCatalog-bullseye.yaml.sigstore.json deleted file mode 100644 index 45faa847..00000000 --- a/Debian/ClusterImageCatalog-bullseye.yaml.sigstore.json +++ /dev/null @@ -1 +0,0 @@ -{"mediaType":"application/vnd.dev.sigstore.bundle.v0.3+json", "verificationMaterial":{"certificate":{"rawBytes":"MIIHiTCCBw6gAwIBAgIUb+abAEsXaUW9+B1cVfU+mg7o2uMwCgYIKoZIzj0EAwMwNzEVMBMGA1UEChMMc2lnc3RvcmUuZGV2MR4wHAYDVQQDExVzaWdzdG9yZS1pbnRlcm1lZGlhdGUwHhcNMjYwODMxMDg0MjM1WhcNMjYwODMxMDg1MjM1WjAAMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAENptie6UHpK+h5gH+yzRXfVCM9ooqTIm/gNvzUBktuOhYUtCjJk/W1OKnTs6Ej+ShzuwMRD2m5btYt2EfvEBpEKOCBi0wggYpMA4GA1UdDwEB/wQEAwIHgDATBgNVHSUEDDAKBggrBgEFBQcDAzAdBgNVHQ4EFgQUgFZsiMVBG6znIchDCFA/20iD6QYwHwYDVR0jBBgwFoAU39Ppz1YkEZb5qNjpKFWixi4YZD8wcgYDVR0RAQH/BGgwZoZkaHR0cHM6Ly9naXRodWIuY29tL2Nsb3VkbmF0aXZlLXBnL3Bvc3RncmVzLWNvbnRhaW5lcnMvLmdpdGh1Yi93b3JrZmxvd3MvY2F0YWxvZ3MueW1sQHJlZnMvaGVhZHMvbWFpbjA5BgorBgEEAYO/MAEBBCtodHRwczovL3Rva2VuLmFjdGlvbnMuZ2l0aHVidXNlcmNvbnRlbnQuY29tMCEGCisGAQQBg78wAQIEE3JlcG9zaXRvcnlfZGlzcGF0Y2gwNgYKKwYBBAGDvzABAwQoOWY2NTk4NWNlYTIyNGQ0MWNmZDE4NjZiNzRmMDA1YzUyMGU4YTFlMTAdBgorBgEEAYO/MAEEBA9VcGRhdGUgQ2F0YWxvZ3MwMAYKKwYBBAGDvzABBQQiY2xvdWRuYXRpdmUtcGcvcG9zdGdyZXMtY29udGFpbmVyczAdBgorBgEEAYO/MAEGBA9yZWZzL2hlYWRzL21haW4wOwYKKwYBBAGDvzABCAQtDCtodHRwczovL3Rva2VuLmFjdGlvbnMuZ2l0aHVidXNlcmNvbnRlbnQuY29tMHQGCisGAQQBg78wAQkEZgxkaHR0cHM6Ly9naXRodWIuY29tL2Nsb3VkbmF0aXZlLXBnL3Bvc3RncmVzLWNvbnRhaW5lcnMvLmdpdGh1Yi93b3JrZmxvd3MvY2F0YWxvZ3MueW1sQHJlZnMvaGVhZHMvbWFpbjA4BgorBgEEAYO/MAEKBCoMKDlmNjU5ODVjZWEyMjRkNDFjZmQxODY2Yjc0ZjAwNWM1MjBlOGExZTEwHQYKKwYBBAGDvzABCwQPDA1naXRodWItaG9zdGVkMEUGCisGAQQBg78wAQwENww1aHR0cHM6Ly9naXRodWIuY29tL2Nsb3VkbmF0aXZlLXBnL3Bvc3RncmVzLWNvbnRhaW5lcnMwOAYKKwYBBAGDvzABDQQqDCg5ZjY1OTg1Y2VhMjI0ZDQxY2ZkMTg2NmI3NGYwMDVjNTIwZThhMWUxMB8GCisGAQQBg78wAQ4EEQwPcmVmcy9oZWFkcy9tYWluMBkGCisGAQQBg78wAQ8ECwwJNDcwNTE4MzkzMDEGCisGAQQBg78wARAEIwwhaHR0cHM6Ly9naXRodWIuY29tL2Nsb3VkbmF0aXZlLXBnMBkGCisGAQQBg78wAREECwwJMTAwMzczODUyMHQGCisGAQQBg78wARIEZgxkaHR0cHM6Ly9naXRodWIuY29tL2Nsb3VkbmF0aXZlLXBnL3Bvc3RncmVzLWNvbnRhaW5lcnMvLmdpdGh1Yi93b3JrZmxvd3MvY2F0YWxvZ3MueW1sQHJlZnMvaGVhZHMvbWFpbjA4BgorBgEEAYO/MAETBCoMKDlmNjU5ODVjZWEyMjRkNDFjZmQxODY2Yjc0ZjAwNWM1MjBlOGExZTEwIwYKKwYBBAGDvzABFAQVDBNyZXBvc2l0b3J5X2Rpc3BhdGNoMGkGCisGAQQBg78wARUEWwxZaHR0cHM6Ly9naXRodWIuY29tL2Nsb3VkbmF0aXZlLXBnL3Bvc3RncmVzLWNvbnRhaW5lcnMvYWN0aW9ucy9ydW5zLzMzMzc0MDg4NTMzL2F0dGVtcHRzLzEwFgYKKwYBBAGDvzABFgQIDAZwdWJsaWMwSwYKKwYBBAGDvzABGAQ9DDtyZXBvOmNsb3VkbmF0aXZlLXBnL3Bvc3RncmVzLWNvbnRhaW5lcnM6cmVmOnJlZnMvaGVhZHMvbWFpbjCBiwYKKwYBBAHWeQIEAgR9BHsAeQB3AN09MGrGxxEyYxkeHJlnNwKiSl643jyt/4eKcoAvKe6OAAABoFb8E/sAAAQDAEgwRgIhAM2A0lXsP5wbPHn6toOXsE8of6yPUNZBdxSwQKCtiXMuAiEAhUkzTDqEqBDM2XneFDp9MW/hosWgAMrIXgqdvh2raJAwCgYIKoZIzj0EAwMDaQAwZgIxANU1GcBtI+iTxBSSRIvHEhjobtSGbxQKyxBvEXKMlSZof5oElHEor0He5Ub03dyG3AIxANuHO8puPV6gEwrLrPLtnxg8jhyyZdB4qXoYY1IClf81Q8p0UbCs79vjOIOXj/TdOg=="}, "tlogEntries":[{"logIndex":"2661009496", "logId":{"keyId":"wNI9atQGlz+VWfO6LRygH4QUfY/8W4RFwiT5i5WRgB0="}, "kindVersion":{"kind":"hashedrekord", "version":"0.0.1"}, "integratedTime":"1788165756", "inclusionPromise":{"signedEntryTimestamp":"MEUCIQDyUxdM0oEckz8s+YDGoSmxxOjam0AtfNX8mRuhnN8FGAIgCvXVcURqRNHBMUgs3WzlxZY3vaqJ4Hg1u5ogYXK+xAs="}, "inclusionProof":{"logIndex":"2539105234", "rootHash":"ItM3eNRXb2URI3nraHxIOXzNO27pkPn3UV7XhWG63d0=", "treeSize":"2539105242", "hashes":["hmFkJBplXnmZ0BUgh6scmOvOawDVRGLfNNJDt3BhjeA=", "MhDZPHG8slTsXFwWBLRANJumR288IE3PUsBBU0PDCP0=", "OSvwnMqOYC8QLaRNQfOgB/10LYznTsc9WxLAVzNsrIM=", "LDQ4lywy+seI8Yrn7ou/eiEA+YadfETckzUoJJ+BwwU=", "S0/AkY0m1dTgBcBZIftt2eDhtzKEcEqAKlE6eQCQwp4=", "1Aqu4VREZjyJr4xWR1RGSCUuVB9NQIUybz5tuIhhKpo=", "fIQPy+whyZ6XXsxCU8ag+c6vHMM2Gv11L3ty64FzGbo=", "umVmUi0lKNBfmfREhIthvWH9b7zVnRUCNcESjOdn980=", "dotUJvbW9TmsTukgFTrKmvNDJxTnE7d38CGuY/Yv2eQ=", "RejW7sReE6RDd/vyP2dSGurQ/dNOyfIDaXNiz1cav4g=", "WEVFSe+k7W0Vxl/Gy4bZBzeitOBihmxTYkpvU022c/Y=", "g5+/gMCdqjuxPEeyDLQmjSnGWz5Rv8NkVdlcQdZiJ4I=", "mJU1hQuBuHhNjhMCb1DGHSZ4U1M1u4Bab2BO30thyb8=", "xXfHVELbjDozbTr0sjzbmRP6GUvG/27hOiQJYOVxR5Y=", "+qczX07Ycfz5BNpuVZtZcdL6Yf+sjJLgVPbCcw3lquM=", "LLd51K9Pz6vdG6gf4B+esHiY4Sjd4A+VnkSYiwPk754=", "27FXLReT3RR5GzpH4vpkqX8TUy7eBNMMjdIPN7I5GHA=", "fABv5KbTDQGTSJg+5k8zHZQKwnOUQHo6srePRzgEpf8=", "ddECIA46kQzLbMwjR1L9WCHUWrsqVGYIgRiw6XlG1xs=", "0HfdxDt/zGugZLIuHasrdLEW9s8OaTykSSqBEDFQXdw=", "SndbMKVtcTenAkwi2JBfGzD+mhexp1qJbRIY+A1JRIU=", "xH/DCseLHr9eKoYT8qsORZK7zVdEGYWHuVtsVrD95wY="], "checkpoint":{"envelope":"rekor.sigstore.dev - 1193050959916656506\n2539105242\nItM3eNRXb2URI3nraHxIOXzNO27pkPn3UV7XhWG63d0=\n\n— rekor.sigstore.dev wNI9ajBFAiEAxrLQfYU+xtywWe69+4MafV02gVa6Pwvqb+KO+eV7hG4CIHyTCV+fvudngf6OyZ0GhvcbRyqdyaNz+I4AsttCD2dp\n"}}, "canonicalizedBody":"eyJhcGlWZXJzaW9uIjoiMC4wLjEiLCJraW5kIjoiaGFzaGVkcmVrb3JkIiwic3BlYyI6eyJkYXRhIjp7Imhhc2giOnsiYWxnb3JpdGhtIjoic2hhMjU2IiwidmFsdWUiOiJjNDExNTNlZWIyZmQ5MzRiZDU0MjcwYTY4NGY4ZGFkY2RhZDdjZjdlMTM5OTVjNmIyYjkyZDBmNjE5YWM5N2VmIn19LCJzaWduYXR1cmUiOnsiY29udGVudCI6Ik1FWUNJUUN3anhBK3lvZFNXYTJpbkEvdU83b3Z0bUphUHBSME5ST2dRZ3ZGcTYxa0VRSWhBTHllVTlhbXBMb2NhckZSc3o1T3BDdVNob2pDOHN4bkpOZW5JNjNLNE5uNyIsInB1YmxpY0tleSI6eyJjb250ZW50IjoiTFMwdExTMUNSVWRKVGlCRFJWSlVTVVpKUTBGVVJTMHRMUzB0Q2sxSlNVaHBWRU5EUW5jMlowRjNTVUpCWjBsVllpdGhZa0ZGYzFoaFZWYzVLMEl4WTFabVZTdHRaemR2TW5WTmQwTm5XVWxMYjFwSmVtb3dSVUYzVFhjS1RucEZWazFDVFVkQk1WVkZRMmhOVFdNeWJHNWpNMUoyWTIxVmRWcEhWakpOVWpSM1NFRlpSRlpSVVVSRmVGWjZZVmRrZW1SSE9YbGFVekZ3WW01U2JBcGpiVEZzV2tkc2FHUkhWWGRJYUdOT1RXcFpkMDlFVFhoTlJHY3dUV3BOTVZkb1kwNU5hbGwzVDBSTmVFMUVaekZOYWsweFYycEJRVTFHYTNkRmQxbElDa3R2V2tsNmFqQkRRVkZaU1V0dldrbDZhakJFUVZGalJGRm5RVVZPY0hScFpUWlZTSEJMSzJnMVowZ3JlWHBTV0daV1EwMDViMjl4VkVsdEwyZE9kbm9LVlVKcmRIVlBhRmxWZEVOcVNtc3ZWekZQUzI1VWN6WkZhaXRUYUhwMWQwMVNSREp0TldKMFdYUXlSV1oyUlVKd1JVdFBRMEpwTUhkbloxbHdUVUUwUndwQk1WVmtSSGRGUWk5M1VVVkJkMGxJWjBSQlZFSm5UbFpJVTFWRlJFUkJTMEpuWjNKQ1owVkdRbEZqUkVGNlFXUkNaMDVXU0ZFMFJVWm5VVlZuUmxwekNtbE5Wa0pITm5wdVNXTm9SRU5HUVM4eU1HbEVObEZaZDBoM1dVUldVakJxUWtKbmQwWnZRVlV6T1ZCd2VqRlphMFZhWWpWeFRtcHdTMFpYYVhocE5Ga0tXa1E0ZDJObldVUldVakJTUVZGSUwwSkhaM2RhYjFwcllVaFNNR05JVFRaTWVUbHVZVmhTYjJSWFNYVlpNamwwVERKT2MySXpWbXRpYlVZd1lWaGFiQXBNV0VKdVRETkNkbU16VW01amJWWjZURmRPZG1KdVVtaGhWelZzWTI1TmRreHRaSEJrUjJneFdXazVNMkl6U25KYWJYaDJaRE5OZGxreVJqQlpWM2gyQ2xvelRYVmxWekZ6VVVoS2JGcHVUWFpoUjFab1draE5kbUpYUm5CaWFrRTFRbWR2Y2tKblJVVkJXVTh2VFVGRlFrSkRkRzlrU0ZKM1kzcHZka3d6VW5ZS1lUSldkVXh0Um1wa1IyeDJZbTVOZFZveWJEQmhTRlpwWkZoT2JHTnRUblppYmxKc1ltNVJkVmt5T1hSTlEwVkhRMmx6UjBGUlVVSm5OemgzUVZGSlJRcEZNMHBzWTBjNWVtRllVblpqYm14bVdrZHNlbU5IUmpCWk1tZDNUbWRaUzB0M1dVSkNRVWRFZG5wQlFrRjNVVzlQVjFreVRsUnJORTVYVG14WlZFbDVDazVIVVRCTlYwNXRXa1JGTkU1cVdtbE9lbEp0VFVSQk1WbDZWWGxOUjFVMFdWUkdiRTFVUVdSQ1oyOXlRbWRGUlVGWlR5OU5RVVZGUWtFNVZtTkhVbWdLWkVkVloxRXlSakJaVjNoMldqTk5kMDFCV1V0TGQxbENRa0ZIUkhaNlFVSkNVVkZwV1RKNGRtUlhVblZaV0ZKd1pHMVZkR05IWTNaalJ6bDZaRWRrZVFwYVdFMTBXVEk1ZFdSSFJuQmliVlo1WTNwQlpFSm5iM0pDWjBWRlFWbFBMMDFCUlVkQ1FUbDVXbGRhZWt3eWFHeFpWMUo2VERJeGFHRlhOSGRQZDFsTENrdDNXVUpDUVVkRWRucEJRa05CVVhSRVEzUnZaRWhTZDJONmIzWk1NMUoyWVRKV2RVeHRSbXBrUjJ4MlltNU5kVm95YkRCaFNGWnBaRmhPYkdOdFRuWUtZbTVTYkdKdVVYVlpNamwwVFVoUlIwTnBjMGRCVVZGQ1p6YzRkMEZSYTBWYVozaHJZVWhTTUdOSVRUWk1lVGx1WVZoU2IyUlhTWFZaTWpsMFRESk9jd3BpTTFaclltMUdNR0ZZV214TVdFSnVURE5DZG1NelVtNWpiVlo2VEZkT2RtSnVVbWhoVnpWc1kyNU5ka3h0WkhCa1IyZ3hXV2s1TTJJelNuSmFiWGgyQ21RelRYWlpNa1l3V1ZkNGRsb3pUWFZsVnpGelVVaEtiRnB1VFhaaFIxWm9Xa2hOZG1KWFJuQmlha0UwUW1kdmNrSm5SVVZCV1U4dlRVRkZTMEpEYjAwS1MwUnNiVTVxVlRWUFJGWnFXbGRGZVUxcVVtdE9SRVpxV20xUmVFOUVXVEpaYW1Nd1dtcEJkMDVYVFRGTmFrSnNUMGRGZUZwVVJYZElVVmxMUzNkWlFncENRVWRFZG5wQlFrTjNVVkJFUVRGdVlWaFNiMlJYU1hSaFJ6bDZaRWRXYTAxRlZVZERhWE5IUVZGUlFtYzNPSGRCVVhkRlRuZDNNV0ZJVWpCalNFMDJDa3g1T1c1aFdGSnZaRmRKZFZreU9YUk1NazV6WWpOV2EySnRSakJoV0Zwc1RGaENia3d6UW5aak0xSnVZMjFXZWt4WFRuWmlibEpvWVZjMWJHTnVUWGNLVDBGWlMwdDNXVUpDUVVkRWRucEJRa1JSVVhGRVEyYzFXbXBaTVU5VVp6RlpNbFpvVFdwSk1GcEVVWGhaTWxwclRWUm5NazV0U1ROT1IxbDNUVVJXYWdwT1ZFbDNXbFJvYUUxWFZYaE5RamhIUTJselIwRlJVVUpuTnpoM1FWRTBSVVZSZDFCamJWWnRZM2s1YjFwWFJtdGplVGwwV1Zkc2RVMUNhMGREYVhOSENrRlJVVUpuTnpoM1FWRTRSVU4zZDBwT1JHTjNUbFJGTkUxNmEzcE5SRVZIUTJselIwRlJVVUpuTnpoM1FWSkJSVWwzZDJoaFNGSXdZMGhOTmt4NU9XNEtZVmhTYjJSWFNYVlpNamwwVERKT2MySXpWbXRpYlVZd1lWaGFiRXhZUW01TlFtdEhRMmx6UjBGUlVVSm5OemgzUVZKRlJVTjNkMHBOVkVGM1RYcGplZ3BQUkZWNVRVaFJSME5wYzBkQlVWRkNaemM0ZDBGU1NVVmFaM2hyWVVoU01HTklUVFpNZVRsdVlWaFNiMlJYU1hWWk1qbDBUREpPYzJJelZtdGliVVl3Q21GWVdteE1XRUp1VEROQ2RtTXpVbTVqYlZaNlRGZE9kbUp1VW1oaFZ6VnNZMjVOZGt4dFpIQmtSMmd4V1drNU0ySXpTbkphYlhoMlpETk5kbGt5UmpBS1dWZDRkbG96VFhWbFZ6RnpVVWhLYkZwdVRYWmhSMVpvV2toTmRtSlhSbkJpYWtFMFFtZHZja0puUlVWQldVOHZUVUZGVkVKRGIwMUxSR3h0VG1wVk5RcFBSRlpxV2xkRmVVMXFVbXRPUkVacVdtMVJlRTlFV1RKWmFtTXdXbXBCZDA1WFRURk5ha0pzVDBkRmVGcFVSWGRKZDFsTFMzZFpRa0pCUjBSMmVrRkNDa1pCVVZaRVFrNTVXbGhDZG1NeWJEQmlNMG8xV0RKU2NHTXpRbWhrUjA1dlRVZHJSME5wYzBkQlVWRkNaemM0ZDBGU1ZVVlhkM2hhWVVoU01HTklUVFlLVEhrNWJtRllVbTlrVjBsMVdUSTVkRXd5VG5OaU0xWnJZbTFHTUdGWVdteE1XRUp1VEROQ2RtTXpVbTVqYlZaNlRGZE9kbUp1VW1oaFZ6VnNZMjVOZGdwWlYwNHdZVmM1ZFdONU9YbGtWelY2VEhwTmVrMTZZekJOUkdjMFRsUk5la3d5UmpCa1IxWjBZMGhTZWt4NlJYZEdaMWxMUzNkWlFrSkJSMFIyZWtGQ0NrWm5VVWxFUVZwM1pGZEtjMkZYVFhkVGQxbExTM2RaUWtKQlIwUjJla0ZDUjBGUk9VUkVkSGxhV0VKMlQyMU9jMkl6Vm10aWJVWXdZVmhhYkV4WVFtNEtURE5DZG1NelVtNWpiVlo2VEZkT2RtSnVVbWhoVnpWc1kyNU5ObU50Vm0xUGJrcHNXbTVOZG1GSFZtaGFTRTEyWWxkR2NHSnFRMEpwZDFsTFMzZFpRZ3BDUVVoWFpWRkpSVUZuVWpsQ1NITkJaVkZDTTBGT01EbE5SM0pIZUhoRmVWbDRhMlZJU214dVRuZExhVk5zTmpRemFubDBMelJsUzJOdlFYWkxaVFpQQ2tGQlFVSnZSbUk0UlM5elFVRkJVVVJCUldkM1VtZEphRUZOTWtFd2JGaHpVRFYzWWxCSWJqWjBiMDlZYzBVNGIyWTJlVkJWVGxwQ1pIaFRkMUZMUTNRS2FWaE5kVUZwUlVGb1ZXdDZWRVJ4UlhGQ1JFMHlXRzVsUmtSd09VMVhMMmh2YzFkblFVMXlTVmhuY1dSMmFESnlZVXBCZDBObldVbExiMXBKZW1vd1JRcEJkMDFFWVZGQmQxcG5TWGhCVGxVeFIyTkNkRWtyYVZSNFFsTlRVa2wyU0VWb2FtOWlkRk5IWW5oUlMzbDRRblpGV0V0TmJGTmFiMlkxYjBWc1NFVnZDbkl3U0dVMVZXSXdNMlI1UnpOQlNYaEJUblZJVHpod2RWQldObWRGZDNKTWNsQk1kRzU0WnpocWFIbDVXbVJDTkhGWWIxbFpNVWxEYkdZNE1WRTRjREFLVldKRGN6YzVkbXBQU1U5WWFpOVVaRTluUFQwS0xTMHRMUzFGVGtRZ1EwVlNWRWxHU1VOQlZFVXRMUzB0TFFvPSJ9fX19"}], "timestampVerificationData":{"rfc3161Timestamps":[{"signedTimestamp":"MIICyTADAgEAMIICwAYJKoZIhvcNAQcCoIICsTCCAq0CAQMxDTALBglghkgBZQMEAgEwgbgGCyqGSIb3DQEJEAEEoIGoBIGlMIGiAgEBBgkrBgEEAYO/MAIwMTANBglghkgBZQMEAgEFAAQgenHt+IcJkyRFO5HSiFrf242jXohMXDjTJ1L+KhBml7kCFQC9XBEyqu3jaVxMRGV7BtPYl5pzgxgPMjAyNjA4MzEwODQyMzVaMAMCAQGgMqQwMC4xFTATBgNVBAoTDHNpZ3N0b3JlLmRldjEVMBMGA1UEAxMMc2lnc3RvcmUtdHNhoAAxggHaMIIB1gIBATBRMDkxFTATBgNVBAoTDHNpZ3N0b3JlLmRldjEgMB4GA1UEAxMXc2lnc3RvcmUtdHNhLXNlbGZzaWduZWQCFDoTVC8MkGHuvMFDL8uKjosqI4sMMAsGCWCGSAFlAwQCAaCB/DAaBgkqhkiG9w0BCQMxDQYLKoZIhvcNAQkQAQQwHAYJKoZIhvcNAQkFMQ8XDTI2MDgzMTA4NDIzNVowLwYJKoZIhvcNAQkEMSIEIF5PI4olPbqSuzOFPCxEzYK56otxt5awErJI1PyvK8h9MIGOBgsqhkiG9w0BCRACLzF/MH0wezB5BCCF+Se8B6tiysO0Q1bBDvyBssaIP9p6uebYcNnROs0FtzBVMD2kOzA5MRUwEwYDVQQKEwxzaWdzdG9yZS5kZXYxIDAeBgNVBAMTF3NpZ3N0b3JlLXRzYS1zZWxmc2lnbmVkAhQ6E1QvDJBh7rzBQy/Lio6LKiOLDDAKBggqhkjOPQQDAgRmMGQCMEHJhSrl7zgooEbQ10OfpjVpL/ZpEs6qyZi841ktz70+n6EKzrNcFBVMCBxGUHPqtwIwRVRFknuB4vKaVUiJJF2sIVupELsOFpab7ghVElkcGi8wFr/3DNwgU/3D4Ahj8VO6"}]}}, "messageSignature":{"messageDigest":{"algorithm":"SHA2_256", "digest":"xBFT7rL9k0vVQnCmhPja3NrXz34TmVxrK5LQ9hmsl+8="}, "signature":"MEYCIQCwjxA+yodSWa2inA/uO7ovtmJaPpR0NROgQgvFq61kEQIhALyeU9ampLocarFRsz5OpCuShojC8sxnJNenI63K4Nn7"}} \ No newline at end of file diff --git a/README.md b/README.md index e36b350d..c53f254d 100644 --- a/README.md +++ b/README.md @@ -57,7 +57,6 @@ including End-of-Life (EOL) and Long-Term Support (LTS) dates. | ------------------------- | :-----: | :----------: | :--------: | :--------: | :--------- | | Trixie (`stable`) | 13 | 2025-08-09 | 2028-08-09 | 2030-06-30 | Supported | | Bookworm (`oldstable`) | 12 | 2023-06-10 | 2026-06-10 | 2028-06-30 | Supported | -| Bullseye (`oldoldstable`) | 11 | 2021-08-14 | 2024-08-14 | 2026-08-31 | Deprecated | > **IMPORTANT:** The CloudNativePG project provides full support for > Debian-based images until each release reaches its official End-of-Life @@ -168,21 +167,6 @@ While the most reliable way to reference an image is by its digest, the `MM.mm-TYPE-OS` tag usually provides a good balance between stability and convenience for most use cases. -### Deprecated Rolling Tags - -For historical reasons, the `system` image also carries two additional rolling -tags: - -- `MM.mm`: latest `system` image for a given PostgreSQL *minor* version (e.g. - `16.10`) on Debian `bullseye`. -- `MM`: latest `system` image for a given PostgreSQL *major* version (e.g. - `16`) on Debian `bullseye`. - -**IMPORTANT:** These tags are **deprecated** and will be **removed when -`bullseye` images reach end of life**. Please migrate to one of the supported -tag formats that explicitly include both the **image type** and the -**distribution version** (e.g. `16.10-minimal-trixie`). - ## Image Catalogs CloudNativePG publishes `ClusterImageCatalog` manifests for CloudNativePG in @@ -191,10 +175,9 @@ with one catalog available for each supported combination of image type and operating system version. **IMPORTANT:** If you are still relying on the legacy -[`ClusterImageCatalog-bullseye.yaml`](Debian/ClusterImageCatalog-bullseye.yaml) -and [`ClusterImageCatalog-bookworm.yaml`](Debian/ClusterImageCatalog-bookworm.yaml) -manifests, please migrate to the new catalogs as soon as possible. These legacy -manifests are deprecated and will be removed along with the `system` image. +[`ClusterImageCatalog-bookworm.yaml`](Debian/ClusterImageCatalog-bookworm.yaml) +manifest, please migrate to the new catalog as soon as possible. This legacy +manifest is deprecated and will be removed along with the `system` image. ## Security diff --git a/docker-bake.hcl b/docker-bake.hcl index d3c2fdd6..25a0760d 100644 --- a/docker-bake.hcl +++ b/docker-bake.hcl @@ -60,9 +60,7 @@ target "default" { // renovate: datasource=docker versioning=loose "debian:trixie-slim@sha256:d7e12182ce18b85b93007c1dedf31f2d29e01ccf3182cc4017c709b6259bc132", // renovate: datasource=docker versioning=loose - "debian:bookworm-slim@sha256:88200866dfff7ea7f5cbcb6ec7c8a701889efe6fe859fe64d6990e4b07ea4171", - // renovate: datasource=docker versioning=loose - "debian:bullseye-slim@sha256:e5b6442dd2e9684cf5e87d8338b5968f3b348636fc0be6d7850a381e3731a2bd" + "debian:bookworm-slim@sha256:88200866dfff7ea7f5cbcb6ec7c8a701889efe6fe859fe64d6990e4b07ea4171" ] } platforms = [ @@ -71,11 +69,11 @@ target "default" { ] dockerfile = "Dockerfile" name = "postgresql-${index(split(".",cleanVersion(pgVersion)),0)}-${tgt}-${distroVersion(base)}" - tags = concat([ + tags = [ "${fullname}:${index(split(".",cleanVersion(pgVersion)),0)}-${tgt}-${distroVersion(base)}", "${fullname}:${cleanVersion(pgVersion)}-${tgt}-${distroVersion(base)}", "${fullname}:${cleanVersion(pgVersion)}-${formatdate("YYYYMMDDhhmm", now)}-${tgt}-${distroVersion(base)}", - ], (tgt == "system" && distroVersion(base) == "bullseye" && isPreview(pgVersion) == false) ? getRollingTags("${fullname}", pgVersion) : []) + ] context = "." target = "${tgt}" args = { @@ -186,11 +184,3 @@ function getPgVersions { ] ) } - -function getRollingTags { - params = [ imageName, pgVersion ] - result = [ - format("%s:%s", imageName, pgVersion), - format("%s:%s", imageName, getMajor(pgVersion)) - ] -}