Skip to content

Commit c098db7

Browse files
committed
fix: reorder image tags to prioritize extension version
Switch extension version and PostgreSQL major in the tag. Compatibilities (pg major and distro) are conventionally at the end of a name. Signed-off-by: Francesco Canovai <[email protected]>
1 parent db797ee commit c098db7

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,22 +30,22 @@ Currently:
3030
Each extension image tag follows this format:
3131

3232
```
33-
<extension-name>:<pg_version>-<ext_version>-<timestamp>-<distro>
33+
<extension-name>:<ext_version>-<timestamp>-<pg_version>-<distro>
3434
```
3535

3636
**Example:**
3737
Building `pgvector` version `0.8.1` on PostgreSQL `18.0` for the `trixie`
3838
distro, with build timestamp `202509101200`, results in:
3939

4040
```
41-
pgvector:18.0-0.8.1-202509101200-trixie
41+
pgvector:0.8.1-202509101200-18-trixie
4242
```
4343

4444
For convenience, **rolling tags** should also be published:
4545

4646
```
47-
pgvector:18.0-0.8.1-trixie
48-
pgvector:18-0.8.1-trixie
47+
pgvector:0.8.1-18-trixie
48+
pgvector:0.8.1-18-trixie
4949
```
5050

5151
This scheme ensures:

docker-bake.hcl

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,11 @@ target "default" {
4646

4747
dockerfile = "Dockerfile"
4848
context = "${metadata.name}/"
49-
name = "${metadata.name}-${pgVersion}-${sanitize(getExtensionVersion(distro, pgVersion))}-${distro}"
49+
name = "${metadata.name}-${sanitize(getExtensionVersion(distro, pgVersion))}-${pgVersion}-${distro}"
5050

5151
tags = [
52-
"${getImageName(fullname)}:${pgVersion}-${getExtensionVersion(distro, pgVersion)}-${distro}",
53-
"${getImageName(fullname)}:${pgVersion}-${getExtensionVersion(distro, pgVersion)}-${formatdate("YYYYMMDDhhmm", now)}-${distro}",
52+
"${getImageName(fullname)}:${getExtensionVersion(distro, pgVersion)}-${pgVersion}-${distro}",
53+
"${getImageName(fullname)}:${getExtensionVersion(distro, pgVersion)}-${formatdate("YYYYMMDDhhmm", now)}-${pgVersion}-${distro}",
5454
]
5555

5656
args = {
@@ -70,8 +70,8 @@ target "default" {
7070
"index,manifest:org.opencontainers.image.version=${getExtensionVersion(distro, pgVersion)}",
7171
"index,manifest:org.opencontainers.image.revision=${revision}",
7272
"index,manifest:org.opencontainers.image.vendor=${authors}",
73-
"index,manifest:org.opencontainers.image.title=${metadata.name} ${pgVersion}-${getExtensionVersion(distro, pgVersion)} ${distro}",
74-
"index,manifest:org.opencontainers.image.description=A ${metadata.name} ${pgVersion}-${getExtensionVersion(distro, pgVersion)} container image",
73+
"index,manifest:org.opencontainers.image.title=${metadata.name} ${getExtensionVersion(distro, pgVersion)} ${pgVersion} ${distro}",
74+
"index,manifest:org.opencontainers.image.description=A ${metadata.name} ${getExtensionVersion(distro, pgVersion)} container image for PostgreSQL ${pgVersion} on ${distro}",
7575
"index,manifest:org.opencontainers.image.documentation=${url}",
7676
"index,manifest:org.opencontainers.image.authors=${authors}",
7777
"index,manifest:org.opencontainers.image.licenses=Apache-2.0",
@@ -85,8 +85,8 @@ target "default" {
8585
"org.opencontainers.image.version" = "${getExtensionVersion(distro, pgVersion)}",
8686
"org.opencontainers.image.revision" = "${revision}",
8787
"org.opencontainers.image.vendor" = "${authors}",
88-
"org.opencontainers.image.title" = "${metadata.name} ${pgVersion}-${getExtensionVersion(distro, pgVersion)} ${distro}",
89-
"org.opencontainers.image.description" = "A ${metadata.name} ${pgVersion}-${getExtensionVersion(distro, pgVersion)} container image",
88+
"org.opencontainers.image.title" = "${metadata.name} ${getExtensionVersion(distro, pgVersion)} ${pgVersion} ${distro}",
89+
"org.opencontainers.image.description" = "A ${metadata.name} ${getExtensionVersion(distro, pgVersion)} container image for PostgreSQL ${pgVersion} on ${distro}",
9090
"org.opencontainers.image.documentation" = "${url}",
9191
"org.opencontainers.image.authors" = "${authors}",
9292
"org.opencontainers.image.licenses" = "Apache-2.0",

0 commit comments

Comments
 (0)