From 8692119ca321f4ee62b98062986ff0181e09b039 Mon Sep 17 00:00:00 2001 From: Gurkan Indibay Date: Tue, 26 Nov 2024 07:39:08 +0000 Subject: [PATCH 1/5] Bump docker to version 12.1.6 --- CHANGELOG.md | 4 ++++ Dockerfile | 8 ++++---- alpine/Dockerfile | 7 +++---- docker-compose.yml | 4 ++-- postgres-14/Dockerfile | 4 ++-- postgres-15/Dockerfile | 4 ++-- 6 files changed, 17 insertions(+), 14 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 92372e5..1f9c086 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +### citus-docker v12.1.6.docker (November 26,2024) ### + +* Bump Citus version to 12.1.6 + ### citus-docker v12.1.5.docker (July 18,2024) ### * Bump Citus version to 12.1.5 diff --git a/Dockerfile b/Dockerfile index 6840ac5..d694546 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ # This file is auto generated from it's template, # see citusdata/tools/packaging_automation/templates/docker/latest/latest.tmpl.dockerfile. -FROM postgres:16.3 -ARG VERSION=12.1.5 +FROM postgres:16.2 +ARG VERSION=12.1.6 LABEL maintainer="Citus Data https://citusdata.com" \ org.label-schema.name="Citus" \ org.label-schema.description="Scalable PostgreSQL for multi-tenant and real-time workloads" \ @@ -20,8 +20,8 @@ RUN apt-get update \ curl \ && curl -s https://install.citusdata.com/community/deb.sh | bash \ && apt-get install -y postgresql-$PG_MAJOR-citus-12.1=$CITUS_VERSION \ - postgresql-$PG_MAJOR-hll=2.18.citus-1 \ - postgresql-$PG_MAJOR-topn=2.6.0.citus-1 \ + postgresql-$PG_MAJOR-hll=2.17.citus-1 \ + postgresql-$PG_MAJOR-topn=2.5.0.citus-1 \ && apt-get purge -y --auto-remove curl \ && rm -rf /var/lib/apt/lists/* diff --git a/alpine/Dockerfile b/alpine/Dockerfile index c2f79d3..ce72eb7 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -1,7 +1,7 @@ # This file is auto generated from it's template, # see citusdata/tools/packaging_automation/templates/docker/alpine/alpine.tmpl.dockerfile. -FROM postgres:16.3-alpine -ARG VERSION=12.1.5 +FROM postgres:16.2-alpine +ARG VERSION=12.1.6 LABEL maintainer="Citus Data https://citusdata.com" \ org.label-schema.name="Citus" \ org.label-schema.description="Scalable PostgreSQL for multi-tenant and real-time workloads" \ @@ -20,9 +20,8 @@ RUN apk add --no-cache \ curl-dev \ openssl-dev \ ca-certificates \ + clang \ llvm \ - llvm15-dev \ - clang15 \ lz4-dev \ zstd-dev \ libxslt-dev \ diff --git a/docker-compose.yml b/docker-compose.yml index 2efdd1b..c24bb8a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -5,7 +5,7 @@ version: "3" services: master: container_name: "${COMPOSE_PROJECT_NAME:-citus}_master" - image: "citusdata/citus:12.1.5" + image: "citusdata/citus:12.1.6" ports: ["${COORDINATOR_EXTERNAL_PORT:-5432}:5432"] labels: ["com.citusdata.role=Master"] environment: &AUTH @@ -15,7 +15,7 @@ services: PGPASSWORD: "${POSTGRES_PASSWORD}" POSTGRES_HOST_AUTH_METHOD: "${POSTGRES_HOST_AUTH_METHOD:-trust}" worker: - image: "citusdata/citus:12.1.5" + image: "citusdata/citus:12.1.6" labels: ["com.citusdata.role=Worker"] depends_on: [manager] environment: *AUTH diff --git a/postgres-14/Dockerfile b/postgres-14/Dockerfile index a31cf0e..fa0f538 100644 --- a/postgres-14/Dockerfile +++ b/postgres-14/Dockerfile @@ -1,7 +1,7 @@ # This file is auto generated from it's template, # see citusdata/tools/packaging_automation/templates/docker/postgres-14/postgres-14.tmpl.dockerfile. -FROM postgres:14.12 -ARG VERSION=12.1.5 +FROM postgres:14.11 +ARG VERSION=12.1.6 LABEL maintainer="Citus Data https://citusdata.com" \ org.label-schema.name="Citus" \ org.label-schema.description="Scalable PostgreSQL for multi-tenant and real-time workloads" \ diff --git a/postgres-15/Dockerfile b/postgres-15/Dockerfile index d6011d5..bc49e8a 100644 --- a/postgres-15/Dockerfile +++ b/postgres-15/Dockerfile @@ -1,7 +1,7 @@ # This file is auto generated from it's template, # see citusdata/tools/packaging_automation/templates/docker/postgres-15/postgres-15.tmpl.dockerfile. -FROM postgres:15.7 -ARG VERSION=12.1.5 +FROM postgres:15.6 +ARG VERSION=12.1.6 LABEL maintainer="Citus Data https://citusdata.com" \ org.label-schema.name="Citus" \ org.label-schema.description="Scalable PostgreSQL for multi-tenant and real-time workloads" \ From e3c9bb0b26c8410f6513b67ccb5dd1512537ace2 Mon Sep 17 00:00:00 2001 From: Gurkan Indibay Date: Tue, 26 Nov 2024 10:55:08 +0300 Subject: [PATCH 2/5] Bump Postgres versions to 16.6, 15.10, 14.15 and update changelog --- CHANGELOG.md | 6 ++++-- Dockerfile | 2 +- pkgvars | 6 +++--- postgres-14/Dockerfile | 2 +- postgres-15/Dockerfile | 2 +- 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1f9c086..8de4e34 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ * Bump Citus version to 12.1.6 +* Bump Postgres versions to 16.6, 15.10, 14.15 + ### citus-docker v12.1.5.docker (July 18,2024) ### * Bump Citus version to 12.1.5 @@ -10,7 +12,7 @@ * Bump Citus version to 12.1.4 -* Bump Postgresql versions to 16.3, 15.7, 14.12 +* Bump Postgresql versions to 16.3, 15.7, 14.12 ### citus-docker v12.1.3.docker (April 24,2024) ### @@ -157,7 +159,7 @@ ### citus-docker v10.0.2.docker (March 4, 2021) ### * Bump Citus version to 10.0.2 - + * Bump PostgreSQL version to 13.2 ### citus-docker v9.5.2.docker (January 27, 2021) ### diff --git a/Dockerfile b/Dockerfile index d694546..3808168 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # This file is auto generated from it's template, # see citusdata/tools/packaging_automation/templates/docker/latest/latest.tmpl.dockerfile. -FROM postgres:16.2 +FROM postgres:16.6 ARG VERSION=12.1.6 LABEL maintainer="Citus Data https://citusdata.com" \ org.label-schema.name="Citus" \ diff --git a/pkgvars b/pkgvars index 35d1b5c..d833687 100644 --- a/pkgvars +++ b/pkgvars @@ -1,4 +1,4 @@ -postgres_16_version=16.2 -postgres_15_version=15.6 -postgres_14_version=14.11 +postgres_16_version=16.5 +postgres_15_version=15.10 +postgres_14_version=14.15 diff --git a/postgres-14/Dockerfile b/postgres-14/Dockerfile index fa0f538..041e284 100644 --- a/postgres-14/Dockerfile +++ b/postgres-14/Dockerfile @@ -1,6 +1,6 @@ # This file is auto generated from it's template, # see citusdata/tools/packaging_automation/templates/docker/postgres-14/postgres-14.tmpl.dockerfile. -FROM postgres:14.11 +FROM postgres:14.15 ARG VERSION=12.1.6 LABEL maintainer="Citus Data https://citusdata.com" \ org.label-schema.name="Citus" \ diff --git a/postgres-15/Dockerfile b/postgres-15/Dockerfile index bc49e8a..5bbc798 100644 --- a/postgres-15/Dockerfile +++ b/postgres-15/Dockerfile @@ -1,6 +1,6 @@ # This file is auto generated from it's template, # see citusdata/tools/packaging_automation/templates/docker/postgres-15/postgres-15.tmpl.dockerfile. -FROM postgres:15.6 +FROM postgres:15.10 ARG VERSION=12.1.6 LABEL maintainer="Citus Data https://citusdata.com" \ org.label-schema.name="Citus" \ From ac8b0da163b485aa3a0570d3be46698b9f1acefe Mon Sep 17 00:00:00 2001 From: Gurkan Indibay Date: Tue, 26 Nov 2024 11:00:10 +0300 Subject: [PATCH 3/5] Update Citus extensions to versions 2.18 and 2.6.0 in Dockerfile --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3808168..04c7044 100644 --- a/Dockerfile +++ b/Dockerfile @@ -20,8 +20,8 @@ RUN apt-get update \ curl \ && curl -s https://install.citusdata.com/community/deb.sh | bash \ && apt-get install -y postgresql-$PG_MAJOR-citus-12.1=$CITUS_VERSION \ - postgresql-$PG_MAJOR-hll=2.17.citus-1 \ - postgresql-$PG_MAJOR-topn=2.5.0.citus-1 \ + postgresql-$PG_MAJOR-hll=2.18.citus-1 \ + postgresql-$PG_MAJOR-topn=2.6.0.citus-1 \ && apt-get purge -y --auto-remove curl \ && rm -rf /var/lib/apt/lists/* From 67f55a951633cb873d1f6df0b7594359abe897e9 Mon Sep 17 00:00:00 2001 From: Gurkan Indibay Date: Tue, 26 Nov 2024 11:03:09 +0300 Subject: [PATCH 4/5] Bump Postgres version to 16.6-alpine and update dependencies in Dockerfile --- alpine/Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/alpine/Dockerfile b/alpine/Dockerfile index ce72eb7..7c98c5b 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -1,6 +1,6 @@ # This file is auto generated from it's template, # see citusdata/tools/packaging_automation/templates/docker/alpine/alpine.tmpl.dockerfile. -FROM postgres:16.2-alpine +FROM postgres:16.6-alpine ARG VERSION=12.1.6 LABEL maintainer="Citus Data https://citusdata.com" \ org.label-schema.name="Citus" \ @@ -20,8 +20,9 @@ RUN apk add --no-cache \ curl-dev \ openssl-dev \ ca-certificates \ - clang \ llvm \ + llvm15-dev \ + clang15 \ lz4-dev \ zstd-dev \ libxslt-dev \ From 015f98c079527f6546efb9854bd07eca371a3253 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=BCrkan=20=C4=B0ndibay?= Date: Tue, 26 Nov 2024 15:42:49 +0300 Subject: [PATCH 5/5] Update pkgvars Co-authored-by: Onur Tirtir --- pkgvars | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgvars b/pkgvars index d833687..4142afc 100644 --- a/pkgvars +++ b/pkgvars @@ -1,4 +1,4 @@ -postgres_16_version=16.5 +postgres_16_version=16.6 postgres_15_version=15.10 postgres_14_version=14.15