Skip to content

Commit 5429707

Browse files
author
Gürkan İndibay
authored
Updates repo with PG 16 changes (#345)
* Adds pg 16 * Fixes version problem * Fixes alpine version * Updates tools tags
1 parent 22eb14b commit 5429707

9 files changed

Lines changed: 60 additions & 17 deletions

.github/workflows/publish_docker_images_cron.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
uses: actions/checkout@v3
2727

2828
- name: Clone tools branch
29-
run: git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools
29+
run: git clone -b v0.8.30 --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_manual.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
uses: actions/checkout@v3
2727

2828
- name: Clone tools branch
29-
run: git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools
29+
run: git clone -b v0.8.30 --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: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,15 @@ jobs:
1717
image_type:
1818
- latest
1919
- alpine
20+
- postgres_15
2021
- postgres_14
2122
- nightly
2223
steps:
2324
- name: Checkout repository
2425
uses: actions/checkout@v3
2526

2627
- name: Clone tools branch
27-
run: git clone -b v0.8.24 --depth=1 https://github.com/citusdata/tools.git tools
28+
run: git clone -b v0.8.30 --depth=1 https://github.com/citusdata/tools.git tools
2829

2930
- name: Install package dependencies
3031
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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
ref: master
2828

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

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

.github/workflows/update_version.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
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.27 --depth=1 https://github.com/citusdata/tools.git tools
30+
run: git clone -b v0.8.30 --depth=1 https://github.com/citusdata/tools.git tools
3131

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

Dockerfile

Lines changed: 5 additions & 5 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:15.3
4-
ARG VERSION=12.0.0
3+
FROM postgres:16.0
4+
ARG VERSION=12.1.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" \
@@ -19,9 +19,9 @@ RUN apt-get update \
1919
ca-certificates \
2020
curl \
2121
&& curl -s https://install.citusdata.com/community/deb.sh | bash \
22-
&& apt-get install -y postgresql-$PG_MAJOR-citus-12.0=$CITUS_VERSION \
23-
postgresql-$PG_MAJOR-hll=2.17.citus-1 \
24-
postgresql-$PG_MAJOR-topn=2.5.0.citus-1 \
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 \
2525
&& apt-get purge -y --auto-remove curl \
2626
&& rm -rf /var/lib/apt/lists/*
2727

alpine/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/alpine/alpine.tmpl.dockerfile.
3-
FROM postgres:15.3-alpine
4-
ARG VERSION=12.0.0
3+
FROM postgres:16.0-alpine
4+
ARG VERSION=12.1.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: 5 additions & 5 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/postgres-14/postgres-14.tmpl.dockerfile.
3-
FROM postgres:14.8
4-
ARG VERSION=12.0.0
3+
FROM postgres:14.9
4+
ARG VERSION=12.1.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" \
@@ -19,9 +19,9 @@ RUN apt-get update \
1919
ca-certificates \
2020
curl \
2121
&& curl -s https://install.citusdata.com/community/deb.sh | bash \
22-
&& apt-get install -y postgresql-$PG_MAJOR-citus-12.0=$CITUS_VERSION \
23-
postgresql-$PG_MAJOR-hll=2.17.citus-1 \
24-
postgresql-$PG_MAJOR-topn=2.5.0.citus-1 \
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 \
2525
&& apt-get purge -y --auto-remove curl \
2626
&& rm -rf /var/lib/apt/lists/*
2727

postgres-15/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:15.4
4+
ARG VERSION=12.1.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)