Skip to content

Commit 7fc1949

Browse files
committed
chore: review Dockerfile and metadata.hcl
Fixed the Dockerfile to: - Install the exact EXT_VERSION submitted - Adjust the pg_ivm licenses path - Copy the entire lib/bitcode directory Added newly introduced fields to metadata.hcl and adjusted the structure to comply with the new versions format. Added missing renovate entries in pg_ivm/README.md Signed-off-by: Niccolò Fei <niccolo.fei@enterprisedb.com>
1 parent c9520ea commit 7fc1949

File tree

4 files changed

+20
-14
lines changed

4 files changed

+20
-14
lines changed

pg_ivm/Dockerfile

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,18 @@ ARG EXT_VERSION
99

1010
USER 0
1111

12-
RUN set -eux; \
13-
apt-get update; \
14-
apt-get install -y --no-install-recommends \
15-
postgresql-${PG_MAJOR}-pg-ivm=${EXT_VERSION}*
12+
RUN apt-get update && \
13+
apt-get install -y --no-install-recommends "postgresql-${PG_MAJOR}-pg-ivm=${EXT_VERSION}"
1614

1715
FROM scratch
1816
ARG PG_MAJOR
1917

2018
# Licenses
21-
COPY --from=builder /usr/share/doc/postgresql-${PG_MAJOR}-pg-ivm/copyright /licenses/pg_ivm/
19+
COPY --from=builder /usr/share/doc/postgresql-${PG_MAJOR}-pg-ivm/copyright /licenses/postgresql-${PG_MAJOR}-pg-ivm/
2220

2321
# Libraries
2422
COPY --from=builder /usr/lib/postgresql/${PG_MAJOR}/lib/pg_ivm* /lib/
25-
COPY --from=builder /usr/lib/postgresql/${PG_MAJOR}/lib/bitcode/pg_ivm* /lib/bitcode/
23+
COPY --from=builder /usr/lib/postgresql/${PG_MAJOR}/lib/bitcode/ /lib/bitcode/
2624

2725
# Share
2826
COPY --from=builder /usr/share/postgresql/${PG_MAJOR}/extension/pg_ivm* /share/extension/

pg_ivm/README.md

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,6 @@ materialized views to be updated incrementally when base tables change.
66

77
## Usage
88

9-
<!--
10-
Usage: add instructions on how to use the extension with CloudNativePG.
11-
Include code snippets for Cluster and Database resources as needed.
12-
-->
13-
149
### 1. Add the pg_ivm extension image to your Cluster
1510

1611
Define the `pg_ivm` extension under the `postgresql.extensions` section of
@@ -32,7 +27,8 @@ spec:
3227
extensions:
3328
- name: pg_ivm
3429
image:
35-
reference: ghcr.io/cloudnative-pg/pg_ivm:1.0-18-trixie
30+
# renovate: suite=trixie-pgdg depName=postgresql-18-pg-ivm
31+
reference: ghcr.io/cloudnative-pg/pg_ivm:1.13-18-trixie
3632
```
3733
3834
### 2. Enable the extension in a database
@@ -52,6 +48,7 @@ spec:
5248
name: cluster-pg_ivm
5349
extensions:
5450
- name: pg_ivm
51+
# renovate: suite=trixie-pgdg depName=postgresql-18-pg-ivm extractVersion=^(?<version>\d+\.\d+)
5552
version: '1.13'
5653
```
5754

pg_ivm/metadata.hcl

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,32 @@ metadata = {
44
image_name = "pg_ivm"
55
licenses = ["PostgreSQL"]
66
shared_preload_libraries = []
7+
postgresql_parameters = {}
78
extension_control_path = []
89
dynamic_library_path = []
910
ld_library_path = []
1011
bin_path = []
12+
env = {}
1113
auto_update_os_libs = false
1214
required_extensions = []
1315
create_extension = true
1416

1517
versions = {
1618
trixie = {
19+
"18" = {
1720
// renovate: suite=trixie-pgdg depName=postgresql-18-pg-ivm
18-
"18" = "1.13-1.pgdg13+1"
21+
package = "1.13-1.pgdg13+1"
22+
// renovate: suite=trixie-pgdg depName=postgresql-18-pg-ivm extractVersion=^(?<version>\d+\.\d+)
23+
sql = "1.13"
24+
}
1925
}
2026
bookworm = {
27+
"18" = {
2128
// renovate: suite=bookworm-pgdg depName=postgresql-18-pg-ivm
22-
"18" = "1.13-1.pgdg12+1"
29+
package = "1.13-1.pgdg12+1"
30+
// renovate: suite=bookworm-pgdg depName=postgresql-18-pg-ivm extractVersion=^(?<version>\d+\.\d+)
31+
sql = "1.13"
32+
}
2333
}
2434
}
2535
}

pg_ivm/test/cluster.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,6 @@ spec:
1010
size: 1Gi
1111

1212
postgresql:
13+
parameters: ($values.postgresql_parameters)
1314
shared_preload_libraries: ($values.shared_preload_libraries)
1415
extensions: ($values.extensions)

0 commit comments

Comments
 (0)