Skip to content

Commit 4a25781

Browse files
committed
Bump postgres versions
1 parent 3f72611 commit 4a25781

File tree

2 files changed

+23
-11
lines changed

2 files changed

+23
-11
lines changed

.devcontainer/Dockerfile

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ USER citus
6868

6969
# build postgres versions separately for effective parrallelism and caching of already built versions when changing only certain versions
7070
FROM base AS pg14
71-
RUN MAKEFLAGS="-j $(nproc)" pgenv build 14.12
71+
RUN MAKEFLAGS="-j $(nproc)" pgenv build 14.14
7272
RUN rm .pgenv/src/*.tar*
7373
RUN make -C .pgenv/src/postgresql-*/ clean
7474
RUN make -C .pgenv/src/postgresql-*/src/include install
@@ -80,7 +80,7 @@ RUN cp -r .pgenv/src .pgenv/pgsql-* .pgenv/config .pgenv-staging/
8080
RUN rm .pgenv-staging/config/default.conf
8181

8282
FROM base AS pg15
83-
RUN MAKEFLAGS="-j $(nproc)" pgenv build 15.7
83+
RUN MAKEFLAGS="-j $(nproc)" pgenv build 15.9
8484
RUN rm .pgenv/src/*.tar*
8585
RUN make -C .pgenv/src/postgresql-*/ clean
8686
RUN make -C .pgenv/src/postgresql-*/src/include install
@@ -92,7 +92,19 @@ RUN cp -r .pgenv/src .pgenv/pgsql-* .pgenv/config .pgenv-staging/
9292
RUN rm .pgenv-staging/config/default.conf
9393

9494
FROM base AS pg16
95-
RUN MAKEFLAGS="-j $(nproc)" pgenv build 16.3
95+
RUN MAKEFLAGS="-j $(nproc)" pgenv build 16.5
96+
RUN rm .pgenv/src/*.tar*
97+
RUN make -C .pgenv/src/postgresql-*/ clean
98+
RUN make -C .pgenv/src/postgresql-*/src/include install
99+
100+
# create a staging directory with all files we want to copy from our pgenv build
101+
# we will copy the contents of the staged folder into the final image at once
102+
RUN mkdir .pgenv-staging/
103+
RUN cp -r .pgenv/src .pgenv/pgsql-* .pgenv/config .pgenv-staging/
104+
RUN rm .pgenv-staging/config/default.conf
105+
106+
FROM base AS pg17
107+
RUN MAKEFLAGS="-j $(nproc)" pgenv build 17.1
96108
RUN rm .pgenv/src/*.tar*
97109
RUN make -C .pgenv/src/postgresql-*/ clean
98110
RUN make -C .pgenv/src/postgresql-*/src/include install
@@ -211,7 +223,7 @@ COPY --chown=citus:citus .psqlrc .
211223
RUN sudo chown --from=root:root citus:citus -R ~
212224

213225
# sets default pg version
214-
RUN pgenv switch 16.3
226+
RUN pgenv switch 17.1
215227

216228
# make connecting to the coordinator easy
217229
ENV PGPORT=9700

.github/workflows/build_and_test.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@ jobs:
2626
pgupgrade_image_name: "ghcr.io/citusdata/pgupgradetester"
2727
style_checker_image_name: "ghcr.io/citusdata/stylechecker"
2828
style_checker_tools_version: "0.8.18"
29-
sql_snapshot_pg_version: "16.3"
30-
image_suffix: "-dev-e5b0348"
31-
pg14_version: '{ "major": "14", "full": "14.12" }'
32-
pg15_version: '{ "major": "15", "full": "15.7" }'
33-
pg16_version: '{ "major": "16", "full": "16.3" }'
34-
pg17_version: '{ "major": "17", "full": "17.0" }'
35-
upgrade_pg_versions: "14.12-15.7-16.3-17.0"
29+
sql_snapshot_pg_version: "17.1"
30+
image_suffix: "-dev-849875f"
31+
pg14_version: '{ "major": "14", "full": "14.14" }'
32+
pg15_version: '{ "major": "15", "full": "15.9" }'
33+
pg16_version: '{ "major": "16", "full": "16.5" }'
34+
pg17_version: '{ "major": "17", "full": "17.1" }'
35+
upgrade_pg_versions: "14.14-15.9-16.5-17.1"
3636
steps:
3737
# Since GHA jobs needs at least one step we use a noop step here.
3838
- name: Set up parameters

0 commit comments

Comments
 (0)