Skip to content

refactor: Prepare for Postgres 18 #42

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cbaker6 merged 6 commits into from
Oct 6, 2025
Merged

refactor: Prepare for Postgres 18 #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
76f8cca
refactor: Prepare for Postgres 18
cbaker6 Oct 6, 2025
3c5faa6
Update Dockerfile.pgpool
cbaker6 Oct 6, 2025
62b8420
Update release.yml
cbaker6 Oct 6, 2025
13666ab
Update release-pgpool.yml
cbaker6 Oct 6, 2025
7eae1cf
Update Dockerfile
cbaker6 Oct 6, 2025
3b51dc7
Update Dockerfile.pgpool
cbaker6 Oct 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/release-pgpool.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ on:
schedule:
- cron: '19 3 * * *'
push:
branches: [ main, 15-3.3, 17-3.5 ]
branches: [ main, 15-3.3, 18-3.6 ]
Copy link

@coderabbitai coderabbitai bot Oct 6, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟠 Major

Discipline the brackets, future Symbol of Peace!

Remove the inner padding so the array reads [main, 15-3.3, 18-3.6]. Without it, lint will pounce and the workflow falters. PLUS ULTRA!

Apply this shining diff:

-    branches: [ main, 15-3.3, 18-3.6 ]
+    branches: [main, 15-3.3, 18-3.6]
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
branches: [ main, 15-3.3, 18-3.6 ]
branches: [main, 15-3.3, 18-3.6]
🧰 Tools
🪛 YAMLlint (1.37.1)

[error] 7-7: too many spaces inside brackets

(brackets)

[error] 7-7: too many spaces inside brackets

(brackets)

🤖 Prompt for AI Agents 
In .github/workflows/release-pgpool.yml around line 7, the branches array has
extra inner padding; remove the spaces inside the brackets so the entry reads
exactly [main, 15-3.3, 18-3.6]. Edit the line to eliminate the inner spaces and
ensure the YAML linter accepts the array syntax.


env:
LATEST: '17-3.5'
LATEST: '18-3.6'
Copy link

@coderabbitai coderabbitai bot Oct 6, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🧹 Nitpick | 🔵 Trivial

Keep the LATEST env val spotless!

Maintain consistent formatting mojo here as well to silence lint and keep automation roaring. PLUS ULTRA!

🤖 Prompt for AI Agents 
In .github/workflows/release-pgpool.yml around line 10, the LATEST env value
"LATEST: '18-3.6'" needs to match the repository's YAML formatting conventions;
remove any extraneous whitespace, use the same quote style as other env entries,
and align indentation with surrounding keys so the line is spotless (e.g., no
trailing spaces, correct single-quote usage, and consistent key/value spacing).

REGISTRY: docker.io
IMAGE_NAME: ${{ github.repository }}

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ on:
schedule:
- cron: '19 3 * * *'
push:
branches: [ main, 15-3.3, 17-3.5 ]
branches: [ main, 15-3.3, 18-3.6 ]
Copy link

@coderabbitai coderabbitai bot Oct 6, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟠 Major

Tighten the bracket spacing, young hero!

YAML lint cries out because of the padding around the brackets. Trim it to [main, 15-3.3, 18-3.6] so the workflow stays triumphant! PLUS ULTRA!

Apply this victory diff:

-    branches: [ main, 15-3.3, 18-3.6 ]
+    branches: [main, 15-3.3, 18-3.6]
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
branches: [ main, 15-3.3, 18-3.6 ]
branches: [main, 15-3.3, 18-3.6]
🧰 Tools
🪛 YAMLlint (1.37.1)

[error] 7-7: too many spaces inside brackets

(brackets)

[error] 7-7: too many spaces inside brackets

(brackets)

🤖 Prompt for AI Agents 
.github/workflows/release.yml around line 7: the branch list currently has extra
spaces inside the square brackets which fails YAML linting; remove the padding
so the line reads with no spaces inside the brackets (i.e. change "branches: [
main, 15-3.3, 18-3.6 ]" to use compact bracket spacing "[main, 15-3.3, 18-3.6]")
and save the file.


env:
LATEST: '17-3.5'
LATEST: '18-3.6'
Copy link

@coderabbitai coderabbitai bot Oct 6, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🧹 Nitpick | 🔵 Trivial

Set env.LATEST with heroic precision!

Match the no-padding style here too so lint and builds keep smiling: LATEST: '18-3.6' is fine, just ensure no stray bracket padding. PLUS ULTRA!

🤖 Prompt for AI Agents 
.github/workflows/release.yml around line 10: the LATEST environment value has
stray padding/brackets; remove any surrounding bracket padding so the line reads
exactly LATEST: '18-3.6' with no extra spaces or brackets, ensuring lint passes
and the workflow matches the no-padding style used elsewhere.

REGISTRY: docker.io
IMAGE_NAME: ${{ github.repository }}

Expand Down
6 changes: 3 additions & 3 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
FROM postgres:17-bullseye
FROM postgres:18-trixie

LABEL maintainer="HIPAA Postgres w/ PostGIS Project" \
org.opencontainers.image.description="PostGIS 3.5.2+dfsg-1.pgdg110+1 spatial database extension with PostgreSQL 17 bullseye" \
org.opencontainers.image.description="PostGIS 3.6.0+dfsg-1.pgdg13+1 spatial database extension with PostgreSQL 18 trixie" \
org.opencontainers.image.source="https://github.com/netreconlab/hipaa-postgres/"

ENV POSTGIS_MAJOR=3
ENV POSTGIS_VERSION=3.5.2+dfsg-1.pgdg110+1
ENV POSTGIS_VERSION=3.6.0+dfsg-1.pgdg13+1
ENV POSTGRES_INITDB_ARGS="--data-checksums"

RUN apt-get update \
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile.pgpool
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
FROM postgres:17-bullseye
FROM postgres:18-trixie

LABEL maintainer="HIPAA Postgres w/ PostGIS Project" \
org.opencontainers.image.description="PostGIS 3.5.2+dfsg-1.pgdg110+1 spatial database extension and PGPool with PostgreSQL 17 bullseye" \
org.opencontainers.image.description="PostGIS 3.5.2+dfsg-1.pgdg110+1 spatial database extension and PGPool with PostgreSQL 18 trixie" \
org.opencontainers.image.source="https://github.com/netreconlab/hipaa-postgres/"

ENV POSTGIS_MAJOR=3
ENV POSTGIS_VERSION=3.5.2+dfsg-1.pgdg110+1
ENV POSTGIS_VERSION=3.6.0+dfsg-1.pgdg13+1
ENV POSTGRES_INITDB_ARGS="--data-checksums"

RUN apt-get update \
Expand Down