From 720fd17c4f1f7b9e87d8b51f8b94c3053410a52b Mon Sep 17 00:00:00 2001 From: Gurkan Indibay Date: Fri, 30 Sep 2022 13:00:34 +0000 Subject: [PATCH 1/7] Bump docker to version 11.1.2 --- CHANGELOG.md | 6 ++++++ Dockerfile | 4 ++-- alpine/Dockerfile | 6 ++---- docker-compose.yml | 4 ++-- postgres-12/Dockerfile | 6 +++--- postgres-13/Dockerfile | 4 ++-- tools | 1 + 7 files changed, 18 insertions(+), 13 deletions(-) create mode 160000 tools diff --git a/CHANGELOG.md b/CHANGELOG.md index e68eba0..16008a2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +### citus-docker v11.1.2.docker (September 30,2022) ### + +* Bump Citus version to 11.1.2 + +* Bump PostgreSQL version to 14.2 + ### citus-docker v11.1.1.docker (September 16,2022) ### * Bump Citus version to 11.1.1 diff --git a/Dockerfile b/Dockerfile index e21c4fe..9328dbd 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:14.5 -ARG VERSION=11.1.1 +FROM postgres:14.2 +ARG VERSION=11.1.2 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/alpine/Dockerfile b/alpine/Dockerfile index 813d109..8af6439 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:14.5-alpine -ARG VERSION=11.1.1 +FROM postgres:14.2-alpine +ARG VERSION=11.1.2 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" \ @@ -24,8 +24,6 @@ RUN apk add --no-cache \ llvm \ lz4-dev \ zstd-dev \ - libxslt-dev \ - libxml2-dev \ icu-dev && \ apk add --no-cache libcurl && \ curl -sfLO "https://github.com/citusdata/citus/archive/v${VERSION}.tar.gz" && \ diff --git a/docker-compose.yml b/docker-compose.yml index 0f85bff..3f8c051 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:11.1.1" + image: "citusdata/citus:11.1.2" 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:11.1.1" + image: "citusdata/citus:11.1.2" labels: ["com.citusdata.role=Worker"] depends_on: [manager] environment: *AUTH diff --git a/postgres-12/Dockerfile b/postgres-12/Dockerfile index ef22266..49388a5 100644 --- a/postgres-12/Dockerfile +++ b/postgres-12/Dockerfile @@ -1,7 +1,7 @@ # This file is auto generated from it's template, # see citusdata/tools/packaging_automation/templates/docker/postgres-12/postgres-12.tmpl.dockerfile. -FROM postgres:12.12 -ARG VERSION=11.0.6 +FROM postgres:12.10 +ARG VERSION=11.1.2 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" \ @@ -19,7 +19,7 @@ RUN apt-get update \ ca-certificates \ curl \ && curl -s https://install.citusdata.com/community/deb.sh | bash \ - && apt-get install -y postgresql-$PG_MAJOR-citus-11.0=$CITUS_VERSION \ + && apt-get install -y postgresql-$PG_MAJOR-citus-11.1=$CITUS_VERSION \ postgresql-$PG_MAJOR-hll=2.16.citus-1 \ postgresql-$PG_MAJOR-topn=2.4.0 \ && apt-get purge -y --auto-remove curl \ diff --git a/postgres-13/Dockerfile b/postgres-13/Dockerfile index 6e234cf..dedd878 100644 --- a/postgres-13/Dockerfile +++ b/postgres-13/Dockerfile @@ -1,7 +1,7 @@ # This file is auto generated from it's template, # see citusdata/tools/packaging_automation/templates/docker/postgres-13/postgres-13.tmpl.dockerfile. -FROM postgres:13.8 -ARG VERSION=11.1.1 +FROM postgres:13.6 +ARG VERSION=11.1.2 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/tools b/tools new file mode 160000 index 0000000..1ab6a8e --- /dev/null +++ b/tools @@ -0,0 +1 @@ +Subproject commit 1ab6a8e33b43df446a5739f72807cf7ecd4e8d42 From e6e7ca9cc8988e3afa19b4f6ae1d695753eb5b2d Mon Sep 17 00:00:00 2001 From: gindibay Date: Fri, 30 Sep 2022 16:13:39 +0300 Subject: [PATCH 2/7] Adds latest additions --- Dockerfile | 2 +- alpine/Dockerfile | 4 +++- postgres-13/Dockerfile | 2 +- postgres-15/Dockerfile | 42 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 47 insertions(+), 3 deletions(-) create mode 100644 postgres-15/Dockerfile diff --git a/Dockerfile b/Dockerfile index 9328dbd..0baaa8f 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:14.2 +FROM postgres:14.5 ARG VERSION=11.1.2 LABEL maintainer="Citus Data https://citusdata.com" \ org.label-schema.name="Citus" \ diff --git a/alpine/Dockerfile b/alpine/Dockerfile index 8af6439..ecb2457 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:14.2-alpine +FROM postgres:14.5-alpine ARG VERSION=11.1.2 LABEL maintainer="Citus Data https://citusdata.com" \ org.label-schema.name="Citus" \ @@ -24,6 +24,8 @@ RUN apk add --no-cache \ llvm \ lz4-dev \ zstd-dev \ + libxslt-dev \ + libxml2-dev \ icu-dev && \ apk add --no-cache libcurl && \ curl -sfLO "https://github.com/citusdata/citus/archive/v${VERSION}.tar.gz" && \ diff --git a/postgres-13/Dockerfile b/postgres-13/Dockerfile index dedd878..b9b553a 100644 --- a/postgres-13/Dockerfile +++ b/postgres-13/Dockerfile @@ -1,6 +1,6 @@ # This file is auto generated from it's template, # see citusdata/tools/packaging_automation/templates/docker/postgres-13/postgres-13.tmpl.dockerfile. -FROM postgres:13.6 +FROM postgres:13.8 ARG VERSION=11.1.2 LABEL maintainer="Citus Data https://citusdata.com" \ org.label-schema.name="Citus" \ diff --git a/postgres-15/Dockerfile b/postgres-15/Dockerfile new file mode 100644 index 0000000..ba090c6 --- /dev/null +++ b/postgres-15/Dockerfile @@ -0,0 +1,42 @@ +# This file is auto generated from it's template, +# see citusdata/tools/packaging_automation/templates/docker/latest/latest.tmpl.dockerfile. +FROM postgres:15beta4 +ARG VERSION=11.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" \ + org.label-schema.url="https://www.citusdata.com" \ + org.label-schema.vcs-url="https://github.com/citusdata/citus" \ + org.label-schema.vendor="Citus Data, Inc." \ + org.label-schema.version=${VERSION} \ + org.label-schema.schema-version="1.0" + +ENV CITUS_VERSION ${VERSION}.citus-1 + +# install Citus +RUN apt-get update \ + && apt-get install -y --no-install-recommends \ + ca-certificates \ + curl \ + && curl -s https://install.citusdata.com/community/deb.sh | bash \ + && apt-get install -y postgresql-$PG_MAJOR-citus-11.1=$CITUS_VERSION \ + 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/* + +# add citus to default PostgreSQL config +RUN echo "shared_preload_libraries='citus'" >> /usr/share/postgresql/postgresql.conf.sample + +# add scripts to run after initdb +COPY 001-create-citus-extension.sql /docker-entrypoint-initdb.d/ + +# add health check script +COPY pg_healthcheck wait-for-manager.sh / +RUN chmod +x /wait-for-manager.sh + +# entry point unsets PGPASSWORD, but we need it to connect to workers +# https://github.com/docker-library/postgres/blob/33bccfcaddd0679f55ee1028c012d26cd196537d/12/docker-entrypoint.sh#L303 +RUN sed "/unset PGPASSWORD/d" -i /usr/local/bin/docker-entrypoint.sh + +HEALTHCHECK --interval=4s --start-period=6s CMD ./pg_healthcheck \ No newline at end of file From 2b7111c1ced4d80d312a16ff2d5690c88a0d0c55 Mon Sep 17 00:00:00 2001 From: gindibay Date: Fri, 30 Sep 2022 16:16:08 +0300 Subject: [PATCH 3/7] * Rollbacks pg 12 changes * Fixes incorrect changelog --- CHANGELOG.md | 2 -- postgres-12/Dockerfile | 6 +++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 16008a2..f290270 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,8 +2,6 @@ * Bump Citus version to 11.1.2 -* Bump PostgreSQL version to 14.2 - ### citus-docker v11.1.1.docker (September 16,2022) ### * Bump Citus version to 11.1.1 diff --git a/postgres-12/Dockerfile b/postgres-12/Dockerfile index 49388a5..ef22266 100644 --- a/postgres-12/Dockerfile +++ b/postgres-12/Dockerfile @@ -1,7 +1,7 @@ # This file is auto generated from it's template, # see citusdata/tools/packaging_automation/templates/docker/postgres-12/postgres-12.tmpl.dockerfile. -FROM postgres:12.10 -ARG VERSION=11.1.2 +FROM postgres:12.12 +ARG VERSION=11.0.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" \ @@ -19,7 +19,7 @@ RUN apt-get update \ ca-certificates \ curl \ && curl -s https://install.citusdata.com/community/deb.sh | bash \ - && apt-get install -y postgresql-$PG_MAJOR-citus-11.1=$CITUS_VERSION \ + && apt-get install -y postgresql-$PG_MAJOR-citus-11.0=$CITUS_VERSION \ postgresql-$PG_MAJOR-hll=2.16.citus-1 \ postgresql-$PG_MAJOR-topn=2.4.0 \ && apt-get purge -y --auto-remove curl \ From 4c3aaf6ae8f4336ac6fa64729c5063e88df30cc2 Mon Sep 17 00:00:00 2001 From: gindibay Date: Fri, 30 Sep 2022 16:17:01 +0300 Subject: [PATCH 4/7] Adds newline into pg15 Dockerfile --- postgres-15/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/postgres-15/Dockerfile b/postgres-15/Dockerfile index ba090c6..799da8c 100644 --- a/postgres-15/Dockerfile +++ b/postgres-15/Dockerfile @@ -39,4 +39,4 @@ RUN chmod +x /wait-for-manager.sh # https://github.com/docker-library/postgres/blob/33bccfcaddd0679f55ee1028c012d26cd196537d/12/docker-entrypoint.sh#L303 RUN sed "/unset PGPASSWORD/d" -i /usr/local/bin/docker-entrypoint.sh -HEALTHCHECK --interval=4s --start-period=6s CMD ./pg_healthcheck \ No newline at end of file +HEALTHCHECK --interval=4s --start-period=6s CMD ./pg_healthcheck From 2cbcd037a197c9c3eba8e7241e74b497ce77754f Mon Sep 17 00:00:00 2001 From: gindibay Date: Fri, 30 Sep 2022 16:25:14 +0300 Subject: [PATCH 5/7] Fixes citus version in pg15 Dockerfile --- postgres-15/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/postgres-15/Dockerfile b/postgres-15/Dockerfile index 799da8c..95eab1e 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:15beta4 -ARG VERSION=11.1.1 +ARG VERSION=11.1.2 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 f829e27741e220bc67c44f824d93d522fb6cbabd Mon Sep 17 00:00:00 2001 From: gindibay Date: Fri, 30 Sep 2022 16:37:43 +0300 Subject: [PATCH 6/7] Removed dockerfile for pg12 since pg 12 is not supported after citus 11 --- postgres-12/Dockerfile | 42 ------------------------------------------ 1 file changed, 42 deletions(-) delete mode 100644 postgres-12/Dockerfile diff --git a/postgres-12/Dockerfile b/postgres-12/Dockerfile deleted file mode 100644 index ef22266..0000000 --- a/postgres-12/Dockerfile +++ /dev/null @@ -1,42 +0,0 @@ -# This file is auto generated from it's template, -# see citusdata/tools/packaging_automation/templates/docker/postgres-12/postgres-12.tmpl.dockerfile. -FROM postgres:12.12 -ARG VERSION=11.0.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" \ - org.label-schema.url="https://www.citusdata.com" \ - org.label-schema.vcs-url="https://github.com/citusdata/citus" \ - org.label-schema.vendor="Citus Data, Inc." \ - org.label-schema.version=${VERSION} \ - org.label-schema.schema-version="1.0" - -ENV CITUS_VERSION ${VERSION}.citus-1 - -# install Citus -RUN apt-get update \ - && apt-get install -y --no-install-recommends \ - ca-certificates \ - curl \ - && curl -s https://install.citusdata.com/community/deb.sh | bash \ - && apt-get install -y postgresql-$PG_MAJOR-citus-11.0=$CITUS_VERSION \ - postgresql-$PG_MAJOR-hll=2.16.citus-1 \ - postgresql-$PG_MAJOR-topn=2.4.0 \ - && apt-get purge -y --auto-remove curl \ - && rm -rf /var/lib/apt/lists/* - -# add citus to default PostgreSQL config -RUN echo "shared_preload_libraries='citus'" >> /usr/share/postgresql/postgresql.conf.sample - -# add scripts to run after initdb -COPY 001-create-citus-extension.sql /docker-entrypoint-initdb.d/ - -# add health check script -COPY pg_healthcheck wait-for-manager.sh / -RUN chmod +x /wait-for-manager.sh - -# entry point unsets PGPASSWORD, but we need it to connect to workers -# https://github.com/docker-library/postgres/blob/33bccfcaddd0679f55ee1028c012d26cd196537d/12/docker-entrypoint.sh#L303 -RUN sed "/unset PGPASSWORD/d" -i /usr/local/bin/docker-entrypoint.sh - -HEALTHCHECK --interval=4s --start-period=6s CMD ./pg_healthcheck From 9e4990e83396dd72aaa463e0bb7e16719051b773 Mon Sep 17 00:00:00 2001 From: gindibay Date: Fri, 30 Sep 2022 16:38:02 +0300 Subject: [PATCH 7/7] Removes invalid tools submodule --- tools | 1 - 1 file changed, 1 deletion(-) delete mode 160000 tools diff --git a/tools b/tools deleted file mode 160000 index 1ab6a8e..0000000 --- a/tools +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 1ab6a8e33b43df446a5739f72807cf7ecd4e8d42