From 8e20b04c48d1e127665a49e2b9237f2307110a0c Mon Sep 17 00:00:00 2001 From: Gurkan Indibay Date: Mon, 17 Oct 2022 07:58:27 +0000 Subject: [PATCH 1/5] Bump docker to version 11.1.3 --- CHANGELOG.md | 6 ++++++ Dockerfile | 8 ++++---- alpine/Dockerfile | 4 ++-- docker-compose.yml | 4 ++-- pkgvars | 6 +++--- postgres-13/Dockerfile | 6 +++--- postgres-14/Dockerfile | 42 ++++++++++++++++++++++++++++++++++++++++++ tools | 1 + 8 files changed, 63 insertions(+), 14 deletions(-) create mode 100644 postgres-14/Dockerfile create mode 160000 tools diff --git a/CHANGELOG.md b/CHANGELOG.md index f2902703..3cb024fa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +### citus-docker v11.1.3.docker (October 17,2022) ### + +* Bump Citus version to 11.1.3 + +* Bump PostgreSQL version to 15.0 + ### citus-docker v11.1.2.docker (September 30,2022) ### * Bump Citus version to 11.1.2 diff --git a/Dockerfile b/Dockerfile index 0baaa8f2..1bbc374b 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.2 +FROM postgres:15.0 +ARG VERSION=11.1.3 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-11.1=$CITUS_VERSION \ - postgresql-$PG_MAJOR-hll=2.16.citus-1 \ - postgresql-$PG_MAJOR-topn=2.4.0 \ + postgresql-$PG_MAJOR-hll=2.17.citus-1 \ + postgresql-$PG_MAJOR-topn=2.5.0 \ && apt-get purge -y --auto-remove curl \ && rm -rf /var/lib/apt/lists/* diff --git a/alpine/Dockerfile b/alpine/Dockerfile index ecb24578..8c17aaa1 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.2 +FROM postgres:15.0-alpine +ARG VERSION=11.1.3 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/docker-compose.yml b/docker-compose.yml index 3f8c0510..644af2f6 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.2" + image: "citusdata/citus:11.1.3" 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.2" + image: "citusdata/citus:11.1.3" labels: ["com.citusdata.role=Worker"] depends_on: [manager] environment: *AUTH diff --git a/pkgvars b/pkgvars index 3be43bad..c6fef05d 100644 --- a/pkgvars +++ b/pkgvars @@ -1,3 +1,3 @@ -postgres_14_version=14.2 -postgres_13_version=13.6 -postgres_12_version=12.10 +postgres_15_version=15.0 +postgres_14_version=14.5 +postgres_13_version=13.8 diff --git a/postgres-13/Dockerfile b/postgres-13/Dockerfile index b9b553a3..b9ce6b2c 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.2 +ARG VERSION=11.1.3 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-11.1=$CITUS_VERSION \ - postgresql-$PG_MAJOR-hll=2.16.citus-1 \ - postgresql-$PG_MAJOR-topn=2.4.0 \ + postgresql-$PG_MAJOR-hll=2.17.citus-1 \ + postgresql-$PG_MAJOR-topn=2.5.0 \ && apt-get purge -y --auto-remove curl \ && rm -rf /var/lib/apt/lists/* diff --git a/postgres-14/Dockerfile b/postgres-14/Dockerfile new file mode 100644 index 00000000..af7833de --- /dev/null +++ b/postgres-14/Dockerfile @@ -0,0 +1,42 @@ +# This file is auto generated from it's template, +# see citusdata/tools/packaging_automation/templates/docker/postgres-13/postgres-13.tmpl.dockerfile. +FROM postgres:14.5 +ARG VERSION=11.1.3 +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 \ + && 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 diff --git a/tools b/tools new file mode 160000 index 00000000..1bc6066c --- /dev/null +++ b/tools @@ -0,0 +1 @@ +Subproject commit 1bc6066c749db93a59706f4b0aa5f7648ab11695 From 678ea2493b4b96219724496b3dd207c012f3fc94 Mon Sep 17 00:00:00 2001 From: gindibay Date: Mon, 17 Oct 2022 13:48:50 +0300 Subject: [PATCH 2/5] Updates dockerfiles and pipelines --- .../workflows/publish_docker_images_cron.yml | 2 +- .../publish_docker_images_on_manual.yml | 2 +- .../publish_docker_images_on_push.yml | 2 +- .../publish_docker_images_on_tag.yml | 2 +- .github/workflows/update_version.yml | 2 +- Dockerfile | 2 +- postgres-13/Dockerfile | 2 +- postgres-14/Dockerfile | 2 +- postgres-15/Dockerfile | 42 ------------------- 9 files changed, 8 insertions(+), 50 deletions(-) delete mode 100644 postgres-15/Dockerfile diff --git a/.github/workflows/publish_docker_images_cron.yml b/.github/workflows/publish_docker_images_cron.yml index fa6905e3..26b7d580 100644 --- a/.github/workflows/publish_docker_images_cron.yml +++ b/.github/workflows/publish_docker_images_cron.yml @@ -26,7 +26,7 @@ jobs: uses: actions/checkout@v2 - name: Clone tools branch - run: git clone -b v0.8.18 --depth=1 https://github.com/citusdata/tools.git tools + run: git clone -b postgres-15-docker --depth=1 https://github.com/citusdata/tools.git tools - name: Install package dependencies run: sudo apt-get update && sudo apt install libcurl4-openssl-dev libssl-dev python3-testresources diff --git a/.github/workflows/publish_docker_images_on_manual.yml b/.github/workflows/publish_docker_images_on_manual.yml index feeeb698..b94ec017 100644 --- a/.github/workflows/publish_docker_images_on_manual.yml +++ b/.github/workflows/publish_docker_images_on_manual.yml @@ -26,7 +26,7 @@ jobs: uses: actions/checkout@v2 - name: Clone tools branch - run: git clone -b v0.8.18 --depth=1 https://github.com/citusdata/tools.git tools + run: git clone -b postgres-15-docker --depth=1 https://github.com/citusdata/tools.git tools - name: Install package dependencies run: sudo apt-get update && sudo apt install libcurl4-openssl-dev libssl-dev python3-testresources diff --git a/.github/workflows/publish_docker_images_on_push.yml b/.github/workflows/publish_docker_images_on_push.yml index 7385d2bd..307e9aab 100644 --- a/.github/workflows/publish_docker_images_on_push.yml +++ b/.github/workflows/publish_docker_images_on_push.yml @@ -24,7 +24,7 @@ jobs: uses: actions/checkout@v2 - name: Clone tools branch - run: git clone -b v0.8.18 --depth=1 https://github.com/citusdata/tools.git tools + run: git clone -b postgres-15-docker --depth=1 https://github.com/citusdata/tools.git tools - name: Install package dependencies run: sudo apt-get update && sudo apt install libcurl4-openssl-dev libssl-dev python3-testresources diff --git a/.github/workflows/publish_docker_images_on_tag.yml b/.github/workflows/publish_docker_images_on_tag.yml index faa4e4c2..43befd7e 100644 --- a/.github/workflows/publish_docker_images_on_tag.yml +++ b/.github/workflows/publish_docker_images_on_tag.yml @@ -27,7 +27,7 @@ jobs: ref: master - name: Clone tools branch - run: git clone -b v0.8.18 --depth=1 https://github.com/citusdata/tools.git tools + run: git clone -b postgres-15-docker --depth=1 https://github.com/citusdata/tools.git tools - name: Install package dependencies run: sudo apt-get update && sudo apt install libcurl4-openssl-dev libssl-dev python3-testresources diff --git a/.github/workflows/update_version.yml b/.github/workflows/update_version.yml index 6f3b0872..d467a3c2 100644 --- a/.github/workflows/update_version.yml +++ b/.github/workflows/update_version.yml @@ -27,7 +27,7 @@ jobs: run: sudo apt-get update && sudo apt install libcurl4-openssl-dev libssl-dev python3-testresources - name: Clone tools branch - run: git clone -b v0.8.18 --depth=1 https://github.com/citusdata/tools.git tools + run: git clone -b postgres-15-docker --depth=1 https://github.com/citusdata/tools.git tools - name: Set git name and email run: | diff --git a/Dockerfile b/Dockerfile index 1bbc374b..ff411e42 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,7 +21,7 @@ RUN apt-get update \ && 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 \ + 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/postgres-13/Dockerfile b/postgres-13/Dockerfile index b9ce6b2c..56c1f906 100644 --- a/postgres-13/Dockerfile +++ b/postgres-13/Dockerfile @@ -21,7 +21,7 @@ RUN apt-get update \ && 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 \ + 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/postgres-14/Dockerfile b/postgres-14/Dockerfile index af7833de..ce1d1b3e 100644 --- a/postgres-14/Dockerfile +++ b/postgres-14/Dockerfile @@ -21,7 +21,7 @@ RUN apt-get update \ && 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 \ + 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/postgres-15/Dockerfile b/postgres-15/Dockerfile deleted file mode 100644 index 95eab1ed..00000000 --- a/postgres-15/Dockerfile +++ /dev/null @@ -1,42 +0,0 @@ -# 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.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" \ - 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 From d77f0e5562d642f209adcd571ba857ed8070fdbe Mon Sep 17 00:00:00 2001 From: gindibay Date: Mon, 17 Oct 2022 16:44:00 +0300 Subject: [PATCH 3/5] Updates tools tag --- .github/workflows/publish_docker_images_cron.yml | 2 +- .github/workflows/publish_docker_images_on_manual.yml | 2 +- .github/workflows/publish_docker_images_on_push.yml | 2 +- .github/workflows/publish_docker_images_on_tag.yml | 2 +- .github/workflows/update_version.yml | 2 +- tools | 1 - 6 files changed, 5 insertions(+), 6 deletions(-) delete mode 160000 tools diff --git a/.github/workflows/publish_docker_images_cron.yml b/.github/workflows/publish_docker_images_cron.yml index 26b7d580..a3f3e14e 100644 --- a/.github/workflows/publish_docker_images_cron.yml +++ b/.github/workflows/publish_docker_images_cron.yml @@ -26,7 +26,7 @@ jobs: uses: actions/checkout@v2 - name: Clone tools branch - run: git clone -b postgres-15-docker --depth=1 https://github.com/citusdata/tools.git tools + run: git clone -b v0.8.20 --depth=1 https://github.com/citusdata/tools.git tools - name: Install package dependencies run: sudo apt-get update && sudo apt install libcurl4-openssl-dev libssl-dev python3-testresources diff --git a/.github/workflows/publish_docker_images_on_manual.yml b/.github/workflows/publish_docker_images_on_manual.yml index b94ec017..b571911f 100644 --- a/.github/workflows/publish_docker_images_on_manual.yml +++ b/.github/workflows/publish_docker_images_on_manual.yml @@ -26,7 +26,7 @@ jobs: uses: actions/checkout@v2 - name: Clone tools branch - run: git clone -b postgres-15-docker --depth=1 https://github.com/citusdata/tools.git tools + run: git clone -b v0.8.20 --depth=1 https://github.com/citusdata/tools.git tools - name: Install package dependencies run: sudo apt-get update && sudo apt install libcurl4-openssl-dev libssl-dev python3-testresources diff --git a/.github/workflows/publish_docker_images_on_push.yml b/.github/workflows/publish_docker_images_on_push.yml index 307e9aab..2f952f54 100644 --- a/.github/workflows/publish_docker_images_on_push.yml +++ b/.github/workflows/publish_docker_images_on_push.yml @@ -24,7 +24,7 @@ jobs: uses: actions/checkout@v2 - name: Clone tools branch - run: git clone -b postgres-15-docker --depth=1 https://github.com/citusdata/tools.git tools + run: git clone -b v0.8.20 --depth=1 https://github.com/citusdata/tools.git tools - name: Install package dependencies run: sudo apt-get update && sudo apt install libcurl4-openssl-dev libssl-dev python3-testresources diff --git a/.github/workflows/publish_docker_images_on_tag.yml b/.github/workflows/publish_docker_images_on_tag.yml index 43befd7e..d2f24259 100644 --- a/.github/workflows/publish_docker_images_on_tag.yml +++ b/.github/workflows/publish_docker_images_on_tag.yml @@ -27,7 +27,7 @@ jobs: ref: master - name: Clone tools branch - run: git clone -b postgres-15-docker --depth=1 https://github.com/citusdata/tools.git tools + run: git clone -b v0.8.20 --depth=1 https://github.com/citusdata/tools.git tools - name: Install package dependencies run: sudo apt-get update && sudo apt install libcurl4-openssl-dev libssl-dev python3-testresources diff --git a/.github/workflows/update_version.yml b/.github/workflows/update_version.yml index d467a3c2..b9c3c2cc 100644 --- a/.github/workflows/update_version.yml +++ b/.github/workflows/update_version.yml @@ -27,7 +27,7 @@ jobs: run: sudo apt-get update && sudo apt install libcurl4-openssl-dev libssl-dev python3-testresources - name: Clone tools branch - run: git clone -b postgres-15-docker --depth=1 https://github.com/citusdata/tools.git tools + run: git clone -b v0.8.20 --depth=1 https://github.com/citusdata/tools.git tools - name: Set git name and email run: | diff --git a/tools b/tools deleted file mode 160000 index 1bc6066c..00000000 --- a/tools +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 1bc6066c749db93a59706f4b0aa5f7648ab11695 From c307500242bd297f84fd2ca43c8b462d6e1692de Mon Sep 17 00:00:00 2001 From: gindibay Date: Mon, 17 Oct 2022 16:49:36 +0300 Subject: [PATCH 4/5] Fixes template comment --- postgres-14/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/postgres-14/Dockerfile b/postgres-14/Dockerfile index ce1d1b3e..5a5f20e9 100644 --- a/postgres-14/Dockerfile +++ b/postgres-14/Dockerfile @@ -1,5 +1,5 @@ # This file is auto generated from it's template, -# see citusdata/tools/packaging_automation/templates/docker/postgres-13/postgres-13.tmpl.dockerfile. +# see citusdata/tools/packaging_automation/templates/docker/postgres-14/postgres-14.tmpl.dockerfile. FROM postgres:14.5 ARG VERSION=11.1.3 LABEL maintainer="Citus Data https://citusdata.com" \ From 80ee3503528a3110c2743f6b56128422e724116e Mon Sep 17 00:00:00 2001 From: gindibay Date: Mon, 17 Oct 2022 16:55:34 +0300 Subject: [PATCH 5/5] Adds postgres 14 into pipelines --- .github/workflows/publish_docker_images_cron.yml | 1 + .github/workflows/publish_docker_images_on_push.yml | 1 + .github/workflows/publish_docker_images_on_tag.yml | 1 + 3 files changed, 3 insertions(+) diff --git a/.github/workflows/publish_docker_images_cron.yml b/.github/workflows/publish_docker_images_cron.yml index a3f3e14e..4ede7438 100644 --- a/.github/workflows/publish_docker_images_cron.yml +++ b/.github/workflows/publish_docker_images_cron.yml @@ -20,6 +20,7 @@ jobs: - latest - alpine - postgres_13 + - postgres_14 - nightly steps: - name: Checkout repository diff --git a/.github/workflows/publish_docker_images_on_push.yml b/.github/workflows/publish_docker_images_on_push.yml index 2f952f54..3aeac8a4 100644 --- a/.github/workflows/publish_docker_images_on_push.yml +++ b/.github/workflows/publish_docker_images_on_push.yml @@ -18,6 +18,7 @@ jobs: - latest - alpine - postgres_13 + - postgres_14 - nightly steps: - name: Checkout repository diff --git a/.github/workflows/publish_docker_images_on_tag.yml b/.github/workflows/publish_docker_images_on_tag.yml index d2f24259..63e8de7c 100644 --- a/.github/workflows/publish_docker_images_on_tag.yml +++ b/.github/workflows/publish_docker_images_on_tag.yml @@ -18,6 +18,7 @@ jobs: - latest - alpine - postgres_13 + - postgres_14 - nightly steps: - name: Checkout repository