From 76ae5bc56098a5b35304f9d85a7ebc6baea15160 Mon Sep 17 00:00:00 2001 From: Gurkan Indibay Date: Tue, 14 Nov 2023 06:19:41 +0000 Subject: [PATCH 1/2] Bump docker to version 12.1.1 --- CHANGELOG.md | 4 ++++ Dockerfile | 8 ++++---- alpine/Dockerfile | 7 +++---- docker-compose.yml | 4 ++-- postgres-14/Dockerfile | 4 ++-- postgres-15/Dockerfile | 6 +++--- 6 files changed, 18 insertions(+), 15 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 03224b1..b03421a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +### citus-docker v12.1.1.docker (November 14,2023) ### + +* Bump Citus version to 12.1.1 + ### citus-docker v12.0.0.docker (July 17,2023) ### * Bump Citus version to 12.0.0 diff --git a/Dockerfile b/Dockerfile index 54e1dd5..1d5facb 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.0 -ARG VERSION=12.1.0 +FROM postgres:16.1 +ARG VERSION=12.1.1 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 9700ce8..aaf0bfb 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.0-alpine -ARG VERSION=12.1.0 +FROM postgres:16.1-alpine +ARG VERSION=12.1.1 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 3210908..af3623b 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.0.0" + image: "citusdata/citus:12.1.1" 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.0.0" + image: "citusdata/citus:12.1.1" labels: ["com.citusdata.role=Worker"] depends_on: [manager] environment: *AUTH diff --git a/postgres-14/Dockerfile b/postgres-14/Dockerfile index 9306813..2278522 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.9 -ARG VERSION=12.1.0 +FROM postgres:14.10 +ARG VERSION=12.1.1 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 11b405c..3f6e3f4 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/latest/latest.tmpl.dockerfile. -FROM postgres:15.4 -ARG VERSION=12.1.0 +# see citusdata/tools/packaging_automation/templates/docker/postgres-15/postgres-15.tmpl.dockerfile. +FROM postgres:15.5 +ARG VERSION=12.1.1 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 1fb375e38090ed6da1b2e9d856e9ec0125e5a7b1 Mon Sep 17 00:00:00 2001 From: gindibay Date: Tue, 14 Nov 2023 09:25:44 +0300 Subject: [PATCH 2/2] Fixes missing updates in tools --- Dockerfile | 4 ++-- alpine/Dockerfile | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1d5facb..8555292 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/* diff --git a/alpine/Dockerfile b/alpine/Dockerfile index aaf0bfb..3194f88 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -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 \