Skip to content

Commit b77ec55

Browse files
m3hm3tm3hm3t
committed
Update Dockerfiles and workflows to use PostgreSQL 17.2 and version 13.0.0
1 parent 675edcf commit b77ec55

File tree

10 files changed

+62
-15
lines changed

10 files changed

+62
-15
lines changed

‎.github/workflows/hadolint.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131

3232
steps:
3333
- name: Checkout code
34-
uses: actions/checkout@v3
34+
uses: actions/checkout@v4
3535

3636
- name: Run hadolint
3737
uses: hadolint/hadolint-action@f988afea3da57ee48710a9795b6bb677cc901183

‎.github/workflows/publish_docker_images_cron.yml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,16 @@ jobs:
1919
image_type:
2020
- latest
2121
- alpine
22+
- postgres_16
23+
- postgres_15
2224
- postgres_14
2325
- nightly
2426
steps:
2527
- name: Checkout repository
26-
uses: actions/checkout@v3
28+
uses: actions/checkout@v4
2729

2830
- name: Clone tools branch
29-
run: git clone -b v0.8.30 --depth=1 https://github.com/citusdata/tools.git tools
31+
run: git clone -b release-13.0 --depth=1 https://github.com/citusdata/tools.git tools
3032

3133
- name: Install package dependencies
3234
run: sudo apt-get update && sudo apt install libcurl4-openssl-dev libssl-dev python3-testresources

‎.github/workflows/publish_docker_images_on_manual.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ jobs:
2323
fail-fast: false
2424
steps:
2525
- name: Checkout repository
26-
uses: actions/checkout@v3
26+
uses: actions/checkout@v4
2727

2828
- name: Clone tools branch
29-
run: git clone -b v0.8.30 --depth=1 https://github.com/citusdata/tools.git tools
29+
run: git clone -b release-13.0 --depth=1 https://github.com/citusdata/tools.git tools
3030

3131
- name: Install package dependencies
3232
run: sudo apt-get update && sudo apt install libcurl4-openssl-dev libssl-dev python3-testresources

‎.github/workflows/publish_docker_images_on_push.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,16 @@ jobs:
1717
image_type:
1818
- latest
1919
- alpine
20+
- postgres_16
2021
- postgres_15
2122
- postgres_14
2223
- nightly
2324
steps:
2425
- name: Checkout repository
25-
uses: actions/checkout@v3
26+
uses: actions/checkout@v4
2627

2728
- name: Clone tools branch
28-
run: git clone -b v0.8.30 --depth=1 https://github.com/citusdata/tools.git tools
29+
run: git clone -b release-13.0 --depth=1 https://github.com/citusdata/tools.git tools
2930

3031
- name: Install package dependencies
3132
run: sudo apt-get update && sudo apt install libcurl4-openssl-dev libssl-dev python3-testresources

‎.github/workflows/publish_docker_images_on_tag.yml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,19 @@ jobs:
1717
image_type:
1818
- latest
1919
- alpine
20+
- postgres_16
21+
- postgres_15
2022
- postgres_14
2123
- nightly
2224
steps:
2325
- name: Checkout repository
24-
uses: actions/checkout@v3
26+
uses: actions/checkout@v4
2527
with:
2628
fetch-depth: 0
2729
ref: master
2830

2931
- name: Clone tools branch
30-
run: git clone -b v0.8.30 --depth=1 https://github.com/citusdata/tools.git tools
32+
run: git clone -b release-13.0 --depth=1 https://github.com/citusdata/tools.git tools
3133

3234
- name: Install package dependencies
3335
run: sudo apt-get update && sudo apt install libcurl4-openssl-dev libssl-dev python3-testresources

‎.github/workflows/update_version.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@ jobs:
2121
runs-on: ubuntu-latest
2222
steps:
2323
- name: Checkout repository
24-
uses: actions/checkout@v3
24+
uses: actions/checkout@v4
2525

2626
- name: Install package dependencies
2727
run: sudo apt-get update && sudo apt install libcurl4-openssl-dev libssl-dev python3-testresources
2828

2929
- name: Clone tools branch
30-
run: git clone -b v0.8.30 --depth=1 https://github.com/citusdata/tools.git tools
30+
run: git clone -b release-13.0 --depth=1 https://github.com/citusdata/tools.git tools
3131

3232
- name: Set git name and email
3333
run: |

‎Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# This file is auto generated from it's template,
22
# see citusdata/tools/packaging_automation/templates/docker/latest/latest.tmpl.dockerfile.
3-
FROM postgres:16.6
4-
ARG VERSION=12.1.6
3+
FROM postgres:17.2
4+
ARG VERSION=13.0.0
55
LABEL maintainer="Citus Data https://citusdata.com" \
66
org.label-schema.name="Citus" \
77
org.label-schema.description="Scalable PostgreSQL for multi-tenant and real-time workloads" \

‎postgres-14/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# This file is auto generated from it's template,
22
# see citusdata/tools/packaging_automation/templates/docker/postgres-14/postgres-14.tmpl.dockerfile.
33
FROM postgres:14.15
4-
ARG VERSION=12.1.6
4+
ARG VERSION=13.0.0
55
LABEL maintainer="Citus Data https://citusdata.com" \
66
org.label-schema.name="Citus" \
77
org.label-schema.description="Scalable PostgreSQL for multi-tenant and real-time workloads" \

‎postgres-15/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# This file is auto generated from it's template,
22
# see citusdata/tools/packaging_automation/templates/docker/postgres-15/postgres-15.tmpl.dockerfile.
33
FROM postgres:15.10
4-
ARG VERSION=12.1.6
4+
ARG VERSION=13.0.0
55
LABEL maintainer="Citus Data https://citusdata.com" \
66
org.label-schema.name="Citus" \
77
org.label-schema.description="Scalable PostgreSQL for multi-tenant and real-time workloads" \

‎postgres-16/Dockerfile‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
# This file is auto generated from it's template,
2+
# see citusdata/tools/packaging_automation/templates/docker/latest/latest.tmpl.dockerfile.
3+
FROM postgres:16.6
4+
ARG VERSION=13.0.0
5+
LABEL maintainer="Citus Data https://citusdata.com" \
6+
org.label-schema.name="Citus" \
7+
org.label-schema.description="Scalable PostgreSQL for multi-tenant and real-time workloads" \
8+
org.label-schema.url="https://www.citusdata.com" \
9+
org.label-schema.vcs-url="https://github.com/citusdata/citus" \
10+
org.label-schema.vendor="Citus Data, Inc." \
11+
org.label-schema.version=${VERSION} \
12+
org.label-schema.schema-version="1.0"
13+
14+
ENV CITUS_VERSION ${VERSION}.citus-1
15+
16+
# install Citus
17+
RUN apt-get update \
18+
&& apt-get install -y --no-install-recommends \
19+
ca-certificates \
20+
curl \
21+
&& curl -s https://install.citusdata.com/community/deb.sh | bash \
22+
&& apt-get install -y postgresql-$PG_MAJOR-citus-12.1=$CITUS_VERSION \
23+
postgresql-$PG_MAJOR-hll=2.18.citus-1 \
24+
postgresql-$PG_MAJOR-topn=2.6.0.citus-1 \
25+
&& apt-get purge -y --auto-remove curl \
26+
&& rm -rf /var/lib/apt/lists/*
27+
28+
# add citus to default PostgreSQL config
29+
RUN echo "shared_preload_libraries='citus'" >> /usr/share/postgresql/postgresql.conf.sample
30+
31+
# add scripts to run after initdb
32+
COPY 001-create-citus-extension.sql /docker-entrypoint-initdb.d/
33+
34+
# add health check script
35+
COPY pg_healthcheck wait-for-manager.sh /
36+
RUN chmod +x /wait-for-manager.sh
37+
38+
# entry point unsets PGPASSWORD, but we need it to connect to workers
39+
# https://github.com/docker-library/postgres/blob/33bccfcaddd0679f55ee1028c012d26cd196537d/12/docker-entrypoint.sh#L303
40+
RUN sed "/unset PGPASSWORD/d" -i /usr/local/bin/docker-entrypoint.sh
41+
42+
HEALTHCHECK --interval=4s --start-period=6s CMD ./pg_healthcheck

0 commit comments

Comments
 (0)