From 727b6812003eb9fbe847ceeb5bd0ac2c33286fb8 Mon Sep 17 00:00:00 2001 From: Gurkan Indibay Date: Thu, 6 Jun 2024 08:41:23 +0000 Subject: [PATCH 1/6] Bump docker to version 12.1.4 --- CHANGELOG.md | 4 ++++ Dockerfile | 6 +++--- alpine/Dockerfile | 5 ++--- docker-compose.yml | 4 ++-- postgres-14/Dockerfile | 2 +- postgres-15/Dockerfile | 2 +- 6 files changed, 13 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 436a742..eef607a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +### citus-docker v12.1.4.docker (June 06,2024) ### + +* Bump Citus version to 12.1.4 + ### citus-docker v12.1.3.docker (April 24,2024) ### * Bump Citus version to 12.1.3 diff --git a/Dockerfile b/Dockerfile index a89157d..f8e4b9f 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.2 -ARG VERSION=12.1.3 +ARG VERSION=12.1.4 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 2f4d637..14d96c7 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.2-alpine -ARG VERSION=12.1.3 +ARG VERSION=12.1.4 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 af95595..3968f05 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.3" + image: "citusdata/citus:12.1.4" 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.3" + image: "citusdata/citus:12.1.4" labels: ["com.citusdata.role=Worker"] depends_on: [manager] environment: *AUTH diff --git a/postgres-14/Dockerfile b/postgres-14/Dockerfile index 9315e30..e94edba 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.11 -ARG VERSION=12.1.3 +ARG VERSION=12.1.4 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 1702bc4..49ecba9 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.6 -ARG VERSION=12.1.3 +ARG VERSION=12.1.4 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 f10f88c5835324529ea15dbd372da36d03d36528 Mon Sep 17 00:00:00 2001 From: gurkanindibay Date: Thu, 6 Jun 2024 11:45:28 +0300 Subject: [PATCH 2/6] Updates postgres versions --- Dockerfile | 6 +++--- alpine/Dockerfile | 2 +- postgres-14/Dockerfile | 2 +- postgres-15/Dockerfile | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index f8e4b9f..7e12c38 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.3 ARG VERSION=12.1.4 LABEL maintainer="Citus Data https://citusdata.com" \ org.label-schema.name="Citus" \ @@ -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/* diff --git a/alpine/Dockerfile b/alpine/Dockerfile index 14d96c7..8330d97 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.3-alpine ARG VERSION=12.1.4 LABEL maintainer="Citus Data https://citusdata.com" \ org.label-schema.name="Citus" \ diff --git a/postgres-14/Dockerfile b/postgres-14/Dockerfile index e94edba..f0afdd6 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.12 ARG VERSION=12.1.4 LABEL maintainer="Citus Data https://citusdata.com" \ org.label-schema.name="Citus" \ diff --git a/postgres-15/Dockerfile b/postgres-15/Dockerfile index 49ecba9..1820673 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.7 ARG VERSION=12.1.4 LABEL maintainer="Citus Data https://citusdata.com" \ org.label-schema.name="Citus" \ From 2bc0ad9fb0a87b7e06b06ac0d0ca28e47c408e62 Mon Sep 17 00:00:00 2001 From: gurkanindibay Date: Thu, 6 Jun 2024 13:05:54 +0300 Subject: [PATCH 3/6] Fixes alpine issue --- alpine/Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/alpine/Dockerfile b/alpine/Dockerfile index 8330d97..6e021ff 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.3-alpine +FROM postgres:16.2-alpine ARG VERSION=12.1.4 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 5562b4a6175cf9af754e59d44fff8458fa65c556 Mon Sep 17 00:00:00 2001 From: gurkanindibay Date: Thu, 6 Jun 2024 13:12:26 +0300 Subject: [PATCH 4/6] Updates postgres version to 16.3 for alpine --- alpine/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/alpine/Dockerfile b/alpine/Dockerfile index 6e021ff..79cd74c 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.3-alpine ARG VERSION=12.1.4 LABEL maintainer="Citus Data https://citusdata.com" \ org.label-schema.name="Citus" \ From 91fd5f039242d9ab364f113c3e9e5238e06902d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=BCrkan=20=C4=B0ndibay?= Date: Thu, 6 Jun 2024 18:13:53 +0300 Subject: [PATCH 5/6] Update CHANGELOG.md --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index eef607a..52aed1d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ * Bump Citus version to 12.1.4 +* Bump Postgresql versions to 16.3,15.7,14.12 + ### citus-docker v12.1.3.docker (April 24,2024) ### * Bump Citus version to 12.1.3 From add896524f8c2381190968aec2d4613df525cf44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=BCrkan=20=C4=B0ndibay?= Date: Thu, 6 Jun 2024 18:14:39 +0300 Subject: [PATCH 6/6] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 52aed1d..4c0b77f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,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) ###