From b621a2d70d0edc29ae1801ff82076c29714b89d3 Mon Sep 17 00:00:00 2001 From: gindibay Date: Wed, 22 Sep 2021 08:29:53 +0300 Subject: [PATCH 01/22] Changes pg13 as latest image --- Dockerfile | 14 +++++--------- {postgres-13 => postgres-14}/Dockerfile | 14 +++++++++----- 2 files changed, 14 insertions(+), 14 deletions(-) rename {postgres-13 => postgres-14}/Dockerfile (74%) diff --git a/Dockerfile b/Dockerfile index 9ce0f4c..91355c0 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:14beta3 +FROM postgres:13.4 ARG VERSION=10.2.0 LABEL maintainer="Citus Data https://citusdata.com" \ org.label-schema.name="Citus" \ @@ -12,20 +12,16 @@ LABEL maintainer="Citus Data https://citusdata.com" \ org.label-schema.schema-version="1.0" ENV CITUS_VERSION ${VERSION}.citus-1 -#install postgresql -RUN apt-get update && apt-get install -y lsb-release apt-utils wget curl gnupg2 && apt-get clean all \ - && wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - \ - && sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main 14" > /etc/apt/sources.list.d/pgdg.list' \ - && apt-get purge -y --auto-remove curl \ - && rm -rf /var/lib/apt/lists/* # 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-10.2=$CITUS_VERSION \ + && curl -s https://install.citusdata.com/community/deb.sh | bash \ + && apt-get install -y postgresql-$PG_MAJOR-citus-10.2=$CITUS_VERSION \ + postgresql-$PG_MAJOR-hll=2.15.citus-1 \ + postgresql-$PG_MAJOR-topn=2.3.1 \ && apt-get purge -y --auto-remove curl \ && rm -rf /var/lib/apt/lists/* diff --git a/postgres-13/Dockerfile b/postgres-14/Dockerfile similarity index 74% rename from postgres-13/Dockerfile rename to postgres-14/Dockerfile index 91355c0..9ce0f4c 100644 --- a/postgres-13/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/latest/latest.tmpl.dockerfile. -FROM postgres:13.4 +FROM postgres:14beta3 ARG VERSION=10.2.0 LABEL maintainer="Citus Data https://citusdata.com" \ org.label-schema.name="Citus" \ @@ -12,16 +12,20 @@ LABEL maintainer="Citus Data https://citusdata.com" \ org.label-schema.schema-version="1.0" ENV CITUS_VERSION ${VERSION}.citus-1 +#install postgresql +RUN apt-get update && apt-get install -y lsb-release apt-utils wget curl gnupg2 && apt-get clean all \ + && wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - \ + && sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main 14" > /etc/apt/sources.list.d/pgdg.list' \ + && apt-get purge -y --auto-remove curl \ + && rm -rf /var/lib/apt/lists/* # 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-10.2=$CITUS_VERSION \ - postgresql-$PG_MAJOR-hll=2.15.citus-1 \ - postgresql-$PG_MAJOR-topn=2.3.1 \ + && curl -s https://install.citusdata.com/community/deb.sh | bash \ + && apt-get install -y postgresql-$PG_MAJOR-citus-10.2=$CITUS_VERSION \ && apt-get purge -y --auto-remove curl \ && rm -rf /var/lib/apt/lists/* From 21d3ba879b5d1a3b43b19549729dd38a2c79d696 Mon Sep 17 00:00:00 2001 From: gindibay Date: Wed, 22 Sep 2021 08:38:13 +0300 Subject: [PATCH 02/22] Removes pg13 and adds pg14 as supported image --- .github/workflows/publish_docker_images_cron.yml | 2 +- .github/workflows/publish_docker_images_on_push.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publish_docker_images_cron.yml b/.github/workflows/publish_docker_images_cron.yml index 8d9f5c1..92de0a1 100644 --- a/.github/workflows/publish_docker_images_cron.yml +++ b/.github/workflows/publish_docker_images_cron.yml @@ -20,7 +20,7 @@ jobs: - latest - alpine - postgres_12 - - 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 62d3cf0..9b2ac6c 100644 --- a/.github/workflows/publish_docker_images_on_push.yml +++ b/.github/workflows/publish_docker_images_on_push.yml @@ -20,7 +20,7 @@ jobs: - latest - alpine - postgres_12 - - postgres_13 + - postgres_14 - nightly steps: - name: Checkout repository From 9e7e0b6c617af96013d6eb3f7428c5a012e33b96 Mon Sep 17 00:00:00 2001 From: gindibay Date: Wed, 22 Sep 2021 10:50:43 +0300 Subject: [PATCH 03/22] Changes tools docker branch --- .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/update_version.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/publish_docker_images_cron.yml b/.github/workflows/publish_docker_images_cron.yml index 92de0a1..c98587d 100644 --- a/.github/workflows/publish_docker_images_cron.yml +++ b/.github/workflows/publish_docker_images_cron.yml @@ -27,7 +27,7 @@ jobs: uses: actions/checkout@v2 - name: Clone tools branch - run: git clone -b v0.8.3 --depth=1 https://github.com/citusdata/tools.git tools + run: git clone -b docker-13-as-main --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 diff --git a/.github/workflows/publish_docker_images_on_manual.yml b/.github/workflows/publish_docker_images_on_manual.yml index 6c0d35d..7006062 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.3 --depth=1 https://github.com/citusdata/tools.git tools + run: git clone -b docker-13-as-main --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 diff --git a/.github/workflows/publish_docker_images_on_push.yml b/.github/workflows/publish_docker_images_on_push.yml index 9b2ac6c..d36bff9 100644 --- a/.github/workflows/publish_docker_images_on_push.yml +++ b/.github/workflows/publish_docker_images_on_push.yml @@ -27,7 +27,7 @@ jobs: uses: actions/checkout@v2 - name: Clone tools branch - run: git clone -b v0.8.3 --depth=1 https://github.com/citusdata/tools.git tools + run: git clone -b docker-13-as-main --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 diff --git a/.github/workflows/update_version.yml b/.github/workflows/update_version.yml index 6eb949e..56df8fa 100644 --- a/.github/workflows/update_version.yml +++ b/.github/workflows/update_version.yml @@ -30,7 +30,7 @@ jobs: run: sudo apt-get update && sudo apt install libcurl4-openssl-dev libssl-dev - name: Clone tools branch - run: git clone -b v0.8.3 --depth=1 https://github.com/citusdata/tools.git tools + run: git clone -b docker-13-as-main --depth=1 https://github.com/citusdata/tools.git tools - name: Set git name and email run: | From 30c55ee6c5eeb1b4a522e9c26e47405151e25fe7 Mon Sep 17 00:00:00 2001 From: gindibay Date: Fri, 24 Sep 2021 14:32:44 +0300 Subject: [PATCH 04/22] Updates pipeline tools branches as v0.8.4 --- .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/update_version.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/publish_docker_images_cron.yml b/.github/workflows/publish_docker_images_cron.yml index c98587d..33ba310 100644 --- a/.github/workflows/publish_docker_images_cron.yml +++ b/.github/workflows/publish_docker_images_cron.yml @@ -27,7 +27,7 @@ jobs: uses: actions/checkout@v2 - name: Clone tools branch - run: git clone -b docker-13-as-main --depth=1 https://github.com/citusdata/tools.git tools + run: git clone -b v0.8.4 --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 diff --git a/.github/workflows/publish_docker_images_on_manual.yml b/.github/workflows/publish_docker_images_on_manual.yml index 7006062..a26c54c 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 docker-13-as-main --depth=1 https://github.com/citusdata/tools.git tools + run: git clone -b v0.8.4 --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 diff --git a/.github/workflows/publish_docker_images_on_push.yml b/.github/workflows/publish_docker_images_on_push.yml index d36bff9..140b5d7 100644 --- a/.github/workflows/publish_docker_images_on_push.yml +++ b/.github/workflows/publish_docker_images_on_push.yml @@ -27,7 +27,7 @@ jobs: uses: actions/checkout@v2 - name: Clone tools branch - run: git clone -b docker-13-as-main --depth=1 https://github.com/citusdata/tools.git tools + run: git clone -b v0.8.4 --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 diff --git a/.github/workflows/update_version.yml b/.github/workflows/update_version.yml index 56df8fa..8e6bb3c 100644 --- a/.github/workflows/update_version.yml +++ b/.github/workflows/update_version.yml @@ -30,7 +30,7 @@ jobs: run: sudo apt-get update && sudo apt install libcurl4-openssl-dev libssl-dev - name: Clone tools branch - run: git clone -b docker-13-as-main --depth=1 https://github.com/citusdata/tools.git tools + run: git clone -b v0.8.4 --depth=1 https://github.com/citusdata/tools.git tools - name: Set git name and email run: | From 52dd6c378e52eaec31668e4fa48fa09d9510aeae Mon Sep 17 00:00:00 2001 From: gindibay Date: Fri, 24 Sep 2021 16:46:10 +0300 Subject: [PATCH 05/22] Downgrades postgres 13 and 12 image versions since latest versions are debian 11 --- .github/workflows/publish_docker_images_cron.yml | 2 +- .github/workflows/publish_docker_images_on_manual.yml | 2 +- .github/workflows/update_version.yml | 2 +- Dockerfile | 2 +- nightly/Dockerfile | 10 ++++++---- postgres-12/Dockerfile | 2 +- 6 files changed, 11 insertions(+), 9 deletions(-) diff --git a/.github/workflows/publish_docker_images_cron.yml b/.github/workflows/publish_docker_images_cron.yml index 33ba310..56d6fb5 100644 --- a/.github/workflows/publish_docker_images_cron.yml +++ b/.github/workflows/publish_docker_images_cron.yml @@ -30,7 +30,7 @@ jobs: run: git clone -b v0.8.4 --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 + run: sudo apt-get update && sudo apt install libcurl4-openssl-dev libssl-dev python3-testresources - name: Install python requirements run: python -m pip install -r tools/packaging_automation/requirements.txt diff --git a/.github/workflows/publish_docker_images_on_manual.yml b/.github/workflows/publish_docker_images_on_manual.yml index a26c54c..33b83c4 100644 --- a/.github/workflows/publish_docker_images_on_manual.yml +++ b/.github/workflows/publish_docker_images_on_manual.yml @@ -29,7 +29,7 @@ jobs: run: git clone -b v0.8.4 --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 + run: sudo apt-get update && sudo apt install libcurl4-openssl-dev libssl-dev python3-testresources - name: Install python requirements run: python -m pip install -r tools/packaging_automation/requirements.txt diff --git a/.github/workflows/update_version.yml b/.github/workflows/update_version.yml index 8e6bb3c..836e7c9 100644 --- a/.github/workflows/update_version.yml +++ b/.github/workflows/update_version.yml @@ -27,7 +27,7 @@ jobs: uses: actions/checkout@v2 - name: Install package dependencies - run: sudo apt-get update && sudo apt install libcurl4-openssl-dev libssl-dev + 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.4 --depth=1 https://github.com/citusdata/tools.git tools diff --git a/Dockerfile b/Dockerfile index 91355c0..c9d0af8 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:13.4 +FROM postgres:13.3 ARG VERSION=10.2.0 LABEL maintainer="Citus Data https://citusdata.com" \ org.label-schema.name="Citus" \ diff --git a/nightly/Dockerfile b/nightly/Dockerfile index 47cce8e..7e209bc 100644 --- a/nightly/Dockerfile +++ b/nightly/Dockerfile @@ -8,14 +8,16 @@ LABEL maintainer="Citus Data https://citusdata.com" \ org.label-schema.version="Nightly" \ org.label-schema.schema-version="1.0" -# switch to Citus nightly +# Perform pre requisites for Citus Nightly Installation RUN apt-key del 1530DF18 \ && rm -rf /etc/apt/sources.list.d/citusdata_community.list \ && apt-get update \ && apt-get install -y --no-install-recommends \ ca-certificates \ - curl \ - && curl -s https://install.citusdata.com/community-nightlies/deb.sh | bash \ + curl + +# Install Citus nightly +RUN curl -s https://install.citusdata.com/community-nightlies/deb.sh | bash \ && apt-get install -y postgresql-$PG_MAJOR-citus \ && apt-get purge -y --auto-remove curl \ - && rm -rf /var/lib/apt/lists/* + && rm -rf /var/lib/apt/lists/* \ No newline at end of file diff --git a/postgres-12/Dockerfile b/postgres-12/Dockerfile index 1c7ca70..33f2a1f 100644 --- a/postgres-12/Dockerfile +++ b/postgres-12/Dockerfile @@ -1,6 +1,6 @@ # 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.8 +FROM postgres:12.7 ARG VERSION=10.2.0 LABEL maintainer="Citus Data https://citusdata.com" \ org.label-schema.name="Citus" \ From 63f31da31263be043b27b6747649554dc0a9e2fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=BCrkan=20=C4=B0ndibay?= Date: Fri, 24 Sep 2021 17:55:44 +0300 Subject: [PATCH 06/22] Update postgres-14/Dockerfile Co-authored-by: Hanefi Onaldi --- postgres-14/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/postgres-14/Dockerfile b/postgres-14/Dockerfile index 9ce0f4c..81615a6 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/latest/latest.tmpl.dockerfile. -FROM postgres:14beta3 +FROM postgres:14rc1 ARG VERSION=10.2.0 LABEL maintainer="Citus Data https://citusdata.com" \ org.label-schema.name="Citus" \ From 8b1423cf22635fd87747ffc253769efc042f6972 Mon Sep 17 00:00:00 2001 From: gindibay Date: Fri, 24 Sep 2021 18:00:49 +0300 Subject: [PATCH 07/22] Rollbacks postgres 14 version since RC1 base image is debian 11 based --- nightly/Dockerfile | 2 +- postgres-14/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nightly/Dockerfile b/nightly/Dockerfile index 7e209bc..14490b0 100644 --- a/nightly/Dockerfile +++ b/nightly/Dockerfile @@ -20,4 +20,4 @@ RUN apt-key del 1530DF18 \ RUN curl -s https://install.citusdata.com/community-nightlies/deb.sh | bash \ && apt-get install -y postgresql-$PG_MAJOR-citus \ && apt-get purge -y --auto-remove curl \ - && rm -rf /var/lib/apt/lists/* \ No newline at end of file + && rm -rf /var/lib/apt/lists/* \ diff --git a/postgres-14/Dockerfile b/postgres-14/Dockerfile index 81615a6..9ce0f4c 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/latest/latest.tmpl.dockerfile. -FROM postgres:14rc1 +FROM postgres:14beta3 ARG VERSION=10.2.0 LABEL maintainer="Citus Data https://citusdata.com" \ org.label-schema.name="Citus" \ From ed5f509d47d929cfd73506e2c6feee4e2177c99b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=BCrkan=20=C4=B0ndibay?= Date: Fri, 24 Sep 2021 18:39:06 +0300 Subject: [PATCH 08/22] Apply suggestions from code review Co-authored-by: Hanefi Onaldi --- .github/workflows/publish_docker_images_cron.yml | 2 +- .github/workflows/update_version.yml | 2 +- nightly/Dockerfile | 2 +- postgres-14/Dockerfile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/publish_docker_images_cron.yml b/.github/workflows/publish_docker_images_cron.yml index 56d6fb5..2cb2795 100644 --- a/.github/workflows/publish_docker_images_cron.yml +++ b/.github/workflows/publish_docker_images_cron.yml @@ -27,7 +27,7 @@ jobs: uses: actions/checkout@v2 - name: Clone tools branch - run: git clone -b v0.8.4 --depth=1 https://github.com/citusdata/tools.git tools + run: git clone -b v0.8.4 --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 836e7c9..9428ed1 100644 --- a/.github/workflows/update_version.yml +++ b/.github/workflows/update_version.yml @@ -30,7 +30,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.4 --depth=1 https://github.com/citusdata/tools.git tools + run: git clone -b v0.8.4 --depth=1 https://github.com/citusdata/tools.git tools - name: Set git name and email run: | diff --git a/nightly/Dockerfile b/nightly/Dockerfile index 14490b0..d527475 100644 --- a/nightly/Dockerfile +++ b/nightly/Dockerfile @@ -8,7 +8,7 @@ LABEL maintainer="Citus Data https://citusdata.com" \ org.label-schema.version="Nightly" \ org.label-schema.schema-version="1.0" -# Perform pre requisites for Citus Nightly Installation +# Perform prerequisites for Citus Nightly Installation RUN apt-key del 1530DF18 \ && rm -rf /etc/apt/sources.list.d/citusdata_community.list \ && apt-get update \ diff --git a/postgres-14/Dockerfile b/postgres-14/Dockerfile index 9ce0f4c..9b55202 100644 --- a/postgres-14/Dockerfile +++ b/postgres-14/Dockerfile @@ -24,7 +24,7 @@ RUN apt-get update \ && apt-get install -y --no-install-recommends \ ca-certificates \ curl \ - && curl -s https://install.citusdata.com/community/deb.sh | bash \ + && curl -s https://install.citusdata.com/community/deb.sh | bash \ && apt-get install -y postgresql-$PG_MAJOR-citus-10.2=$CITUS_VERSION \ && apt-get purge -y --auto-remove curl \ && rm -rf /var/lib/apt/lists/* From 2ae0ea3d0531a8a707a035361f930007389bc65c Mon Sep 17 00:00:00 2001 From: gindibay Date: Fri, 24 Sep 2021 18:43:30 +0300 Subject: [PATCH 09/22] Formats pg14 file --- postgres-14/Dockerfile | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/postgres-14/Dockerfile b/postgres-14/Dockerfile index 9b55202..918eab5 100644 --- a/postgres-14/Dockerfile +++ b/postgres-14/Dockerfile @@ -13,9 +13,15 @@ LABEL maintainer="Citus Data https://citusdata.com" \ ENV CITUS_VERSION ${VERSION}.citus-1 #install postgresql -RUN apt-get update && apt-get install -y lsb-release apt-utils wget curl gnupg2 && apt-get clean all \ +RUN apt-get update \ + && apt-get install -y lsb-release \ + apt-utils \ + wget \ + curl \ + gnupg2 \ + && apt-get clean all \ && wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - \ - && sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main 14" > /etc/apt/sources.list.d/pgdg.list' \ + && echo "deb http://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main 14" > /etc/apt/sources.list.d/pgdg.list \ && apt-get purge -y --auto-remove curl \ && rm -rf /var/lib/apt/lists/* From e85ce0b8adbb8315c1c6a612504fe016fdc2c1c7 Mon Sep 17 00:00:00 2001 From: gindibay Date: Fri, 24 Sep 2021 18:44:13 +0300 Subject: [PATCH 10/22] Formats pg14 file --- postgres-14/Dockerfile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/postgres-14/Dockerfile b/postgres-14/Dockerfile index 918eab5..3f01c25 100644 --- a/postgres-14/Dockerfile +++ b/postgres-14/Dockerfile @@ -15,10 +15,9 @@ ENV CITUS_VERSION ${VERSION}.citus-1 #install postgresql RUN apt-get update \ && apt-get install -y lsb-release \ - apt-utils \ - wget \ - curl \ - gnupg2 \ + apt-utils \ + wget \ + gnupg2 \ && apt-get clean all \ && wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - \ && echo "deb http://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main 14" > /etc/apt/sources.list.d/pgdg.list \ From 0826e03f796eb0efb97cba84258c32068c186857 Mon Sep 17 00:00:00 2001 From: gindibay Date: Fri, 24 Sep 2021 18:48:01 +0300 Subject: [PATCH 11/22] Adds hll and topn into pg14 image --- postgres-14/Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/postgres-14/Dockerfile b/postgres-14/Dockerfile index 3f01c25..02d806e 100644 --- a/postgres-14/Dockerfile +++ b/postgres-14/Dockerfile @@ -31,6 +31,8 @@ RUN apt-get update \ curl \ && curl -s https://install.citusdata.com/community/deb.sh | bash \ && apt-get install -y postgresql-$PG_MAJOR-citus-10.2=$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/* From 4604212182e5168ac02d17c9f97d34138b0f2db0 Mon Sep 17 00:00:00 2001 From: gindibay Date: Fri, 24 Sep 2021 19:09:23 +0300 Subject: [PATCH 12/22] Adds hll and topn into pg14 image --- postgres-14/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/postgres-14/Dockerfile b/postgres-14/Dockerfile index 02d806e..64709ff 100644 --- a/postgres-14/Dockerfile +++ b/postgres-14/Dockerfile @@ -31,8 +31,8 @@ RUN apt-get update \ curl \ && curl -s https://install.citusdata.com/community/deb.sh | bash \ && apt-get install -y postgresql-$PG_MAJOR-citus-10.2=$CITUS_VERSION \ - && postgresql-$PG_MAJOR-hll=2.16.citus-1 \ - && postgresql-$PG_MAJOR-topn=2.4.0 \ + 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/* From 28c5904533167000ab99b0b956d87a5a6bfe51a2 Mon Sep 17 00:00:00 2001 From: gindibay Date: Fri, 24 Sep 2021 19:16:28 +0300 Subject: [PATCH 13/22] Unifies multiple runs into one --- nightly/Dockerfile | 8 +++----- postgres-14/Dockerfile | 8 +++----- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/nightly/Dockerfile b/nightly/Dockerfile index d527475..8d0ed92 100644 --- a/nightly/Dockerfile +++ b/nightly/Dockerfile @@ -14,10 +14,8 @@ RUN apt-key del 1530DF18 \ && apt-get update \ && apt-get install -y --no-install-recommends \ ca-certificates \ - curl - -# Install Citus nightly -RUN curl -s https://install.citusdata.com/community-nightlies/deb.sh | bash \ + curl \ + && curl -s https://install.citusdata.com/community-nightlies/deb.sh | bash \ && apt-get install -y postgresql-$PG_MAJOR-citus \ && apt-get purge -y --auto-remove curl \ - && rm -rf /var/lib/apt/lists/* \ + && rm -rf /var/lib/apt/lists/* diff --git a/postgres-14/Dockerfile b/postgres-14/Dockerfile index 64709ff..178b69f 100644 --- a/postgres-14/Dockerfile +++ b/postgres-14/Dockerfile @@ -12,7 +12,8 @@ LABEL maintainer="Citus Data https://citusdata.com" \ org.label-schema.schema-version="1.0" ENV CITUS_VERSION ${VERSION}.citus-1 -#install postgresql + +#install postgresql repo and citus RUN apt-get update \ && apt-get install -y lsb-release \ apt-utils \ @@ -22,10 +23,7 @@ RUN apt-get update \ && wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - \ && echo "deb http://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main 14" > /etc/apt/sources.list.d/pgdg.list \ && apt-get purge -y --auto-remove curl \ - && rm -rf /var/lib/apt/lists/* - -# install Citus -RUN apt-get update \ + && rm -rf /var/lib/apt/lists/* \ && apt-get install -y --no-install-recommends \ ca-certificates \ curl \ From 6a075126d4556cc86ce25aef41464dd35944b6cd Mon Sep 17 00:00:00 2001 From: gindibay Date: Fri, 24 Sep 2021 19:23:10 +0300 Subject: [PATCH 14/22] Adds curl --- postgres-14/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/postgres-14/Dockerfile b/postgres-14/Dockerfile index 178b69f..3523b65 100644 --- a/postgres-14/Dockerfile +++ b/postgres-14/Dockerfile @@ -19,6 +19,7 @@ RUN apt-get update \ apt-utils \ wget \ gnupg2 \ + curl \ && apt-get clean all \ && wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - \ && echo "deb http://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main 14" > /etc/apt/sources.list.d/pgdg.list \ From 5fc94f430b2d1f2ed0333568e74aa1961d424c29 Mon Sep 17 00:00:00 2001 From: gindibay Date: Fri, 24 Sep 2021 19:50:57 +0300 Subject: [PATCH 15/22] Fixes execution problems --- postgres-14/Dockerfile | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/postgres-14/Dockerfile b/postgres-14/Dockerfile index 3523b65..864ecab 100644 --- a/postgres-14/Dockerfile +++ b/postgres-14/Dockerfile @@ -14,26 +14,26 @@ LABEL maintainer="Citus Data https://citusdata.com" \ ENV CITUS_VERSION ${VERSION}.citus-1 #install postgresql repo and citus +#install postgresql RUN apt-get update \ && apt-get install -y lsb-release \ - apt-utils \ - wget \ - gnupg2 \ - curl \ + apt-utils \ + wget \ + curl \ + gnupg2 \ && apt-get clean all \ && wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - \ && echo "deb http://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main 14" > /etc/apt/sources.list.d/pgdg.list \ - && apt-get purge -y --auto-remove curl \ - && rm -rf /var/lib/apt/lists/* \ && apt-get install -y --no-install-recommends \ ca-certificates \ curl \ - && curl -s https://install.citusdata.com/community/deb.sh | bash \ + && curl -s https://install.citusdata.com/community/deb.sh | bash \ && apt-get install -y postgresql-$PG_MAJOR-citus-10.2=$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/* + postgresql-$PG_MAJOR-hll=2.16.citus-1 \ + postgresql-$PG_MAJOR-topn=2.4.0 \ + && rm -rf /var/lib/apt/lists/* \ + && apt-get purge -y --auto-remove curl + # add citus to default PostgreSQL config RUN echo "shared_preload_libraries='citus'" >> /usr/share/postgresql/postgresql.conf.sample From 21886fde1526e4b8b4f5fc70b65c815bf8b11f19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=BCrkan=20=C4=B0ndibay?= Date: Fri, 24 Sep 2021 19:52:02 +0300 Subject: [PATCH 16/22] Apply suggestions from code review Co-authored-by: Hanefi Onaldi --- .github/workflows/publish_docker_images_on_manual.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish_docker_images_on_manual.yml b/.github/workflows/publish_docker_images_on_manual.yml index 33b83c4..23d9a78 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.4 --depth=1 https://github.com/citusdata/tools.git tools + run: git clone -b v0.8.4 --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 From 429587d9a6079457cba12a1845f49b8fdc2989db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=BCrkan=20=C4=B0ndibay?= Date: Mon, 27 Sep 2021 13:20:37 +0300 Subject: [PATCH 17/22] Removes unnecessary empty space Co-authored-by: Hanefi Onaldi --- .github/workflows/publish_docker_images_on_push.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish_docker_images_on_push.yml b/.github/workflows/publish_docker_images_on_push.yml index 140b5d7..52f6810 100644 --- a/.github/workflows/publish_docker_images_on_push.yml +++ b/.github/workflows/publish_docker_images_on_push.yml @@ -27,7 +27,7 @@ jobs: uses: actions/checkout@v2 - name: Clone tools branch - run: git clone -b v0.8.4 --depth=1 https://github.com/citusdata/tools.git tools + run: git clone -b v0.8.4 --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 From c7c05a0f423ec5ec95c6c30ea41e9b4f258132ec Mon Sep 17 00:00:00 2001 From: gindibay Date: Mon, 27 Sep 2021 16:25:14 +0300 Subject: [PATCH 18/22] Fixes review notes --- postgres-14/Dockerfile | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/postgres-14/Dockerfile b/postgres-14/Dockerfile index 864ecab..15013d1 100644 --- a/postgres-14/Dockerfile +++ b/postgres-14/Dockerfile @@ -14,14 +14,12 @@ LABEL maintainer="Citus Data https://citusdata.com" \ ENV CITUS_VERSION ${VERSION}.citus-1 #install postgresql repo and citus -#install postgresql RUN apt-get update \ && apt-get install -y lsb-release \ apt-utils \ wget \ curl \ gnupg2 \ - && apt-get clean all \ && wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - \ && echo "deb http://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main 14" > /etc/apt/sources.list.d/pgdg.list \ && apt-get install -y --no-install-recommends \ @@ -31,9 +29,8 @@ RUN apt-get update \ && apt-get install -y postgresql-$PG_MAJOR-citus-10.2=$CITUS_VERSION \ postgresql-$PG_MAJOR-hll=2.16.citus-1 \ postgresql-$PG_MAJOR-topn=2.4.0 \ - && rm -rf /var/lib/apt/lists/* \ - && apt-get purge -y --auto-remove curl - + && apt-get purge -y --auto-remove curl wget \ + && rm -rf /var/lib/apt/lists/* # add citus to default PostgreSQL config RUN echo "shared_preload_libraries='citus'" >> /usr/share/postgresql/postgresql.conf.sample From 86882e4aa17e5000bc6a54e4da1a0a22fefcada6 Mon Sep 17 00:00:00 2001 From: gindibay Date: Mon, 27 Sep 2021 16:50:11 +0300 Subject: [PATCH 19/22] Fixes review notes --- postgres-14/Dockerfile | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/postgres-14/Dockerfile b/postgres-14/Dockerfile index 15013d1..71d24a4 100644 --- a/postgres-14/Dockerfile +++ b/postgres-14/Dockerfile @@ -15,17 +15,15 @@ ENV CITUS_VERSION ${VERSION}.citus-1 #install postgresql repo and citus RUN apt-get update \ - && apt-get install -y lsb-release \ + && apt-get install -y --no-install-recommends lsb-release \ apt-utils \ wget \ curl \ gnupg2 \ + ca-certificates \ && wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - \ && echo "deb http://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main 14" > /etc/apt/sources.list.d/pgdg.list \ - && apt-get install -y --no-install-recommends \ - ca-certificates \ - curl \ - && curl -s https://install.citusdata.com/community/deb.sh | bash \ + && curl -s https://install.citusdata.com/community/deb.sh | bash \ && apt-get install -y postgresql-$PG_MAJOR-citus-10.2=$CITUS_VERSION \ postgresql-$PG_MAJOR-hll=2.16.citus-1 \ postgresql-$PG_MAJOR-topn=2.4.0 \ From 55000e88f1398fccfaf1a9d8ad404a832cddfd94 Mon Sep 17 00:00:00 2001 From: gindibay Date: Tue, 28 Sep 2021 10:40:11 +0300 Subject: [PATCH 20/22] Fixes review notes --- Dockerfile | 4 ++-- postgres-12/Dockerfile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index c9d0af8..b623af5 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-10.2=$CITUS_VERSION \ - postgresql-$PG_MAJOR-hll=2.15.citus-1 \ - postgresql-$PG_MAJOR-topn=2.3.1 \ + 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/* diff --git a/postgres-12/Dockerfile b/postgres-12/Dockerfile index 33f2a1f..607744c 100644 --- a/postgres-12/Dockerfile +++ b/postgres-12/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-10.2=$CITUS_VERSION \ - postgresql-$PG_MAJOR-hll=2.15.citus-1 \ - postgresql-$PG_MAJOR-topn=2.3.1 \ + 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/* From cb07ecef1c821d619451b23e67e8de0784c2fcbf Mon Sep 17 00:00:00 2001 From: gindibay Date: Tue, 28 Sep 2021 11:12:47 +0300 Subject: [PATCH 21/22] Bump version into 10.2.1 --- CHANGELOG.md | 6 ++++++ Dockerfile | 4 ++-- docker-compose.yml | 2 +- postgres-12/Dockerfile | 4 ++-- postgres-14/Dockerfile | 23 +++++++++-------------- 5 files changed, 20 insertions(+), 19 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1d3e5c0..03c7918 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +### citus-docker v10.2.1.docker (September 28,2021) ### + +* Bump Citus version to 10.2.1 + +* Adds Postgres 14 image + ### citus-docker v10.1.2.docker (August 18,2021) ### * Bump Citus version to 10.1.2 diff --git a/Dockerfile b/Dockerfile index b623af5..917167d 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:13.3 -ARG VERSION=10.2.0 +FROM postgres:13.4 +ARG VERSION=10.2.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/docker-compose.yml b/docker-compose.yml index 66123fc..0bee4af 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:10.1.2" + image: "citusdata/citus:10.2.1" ports: ["${COORDINATOR_EXTERNAL_PORT:-5432}:5432"] labels: ["com.citusdata.role=Master"] environment: &AUTH diff --git a/postgres-12/Dockerfile b/postgres-12/Dockerfile index 607744c..fb6c44a 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.7 -ARG VERSION=10.2.0 +FROM postgres:12.8 +ARG VERSION=10.2.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-14/Dockerfile b/postgres-14/Dockerfile index 71d24a4..3827cb2 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/latest/latest.tmpl.dockerfile. -FROM postgres:14beta3 -ARG VERSION=10.2.0 +FROM postgres:14rc1 +ARG VERSION=10.2.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" \ @@ -13,21 +13,16 @@ LABEL maintainer="Citus Data https://citusdata.com" \ ENV CITUS_VERSION ${VERSION}.citus-1 -#install postgresql repo and citus -RUN apt-get update \ - && apt-get install -y --no-install-recommends lsb-release \ - apt-utils \ - wget \ - curl \ - gnupg2 \ - ca-certificates \ - && wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - \ - && echo "deb http://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main 14" > /etc/apt/sources.list.d/pgdg.list \ +# 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-10.2=$CITUS_VERSION \ + && apt-get install -y postgresql-$PG_MAJOR-citus-10.2=$CITUS_VERSION \ postgresql-$PG_MAJOR-hll=2.16.citus-1 \ postgresql-$PG_MAJOR-topn=2.4.0 \ - && apt-get purge -y --auto-remove curl wget \ + && apt-get purge -y --auto-remove curl \ && rm -rf /var/lib/apt/lists/* # add citus to default PostgreSQL config From f58901be97f3e9bc8545833a6bfa138e34560ec9 Mon Sep 17 00:00:00 2001 From: gindibay Date: Tue, 28 Sep 2021 11:32:54 +0300 Subject: [PATCH 22/22] Fixes missing docker-compose version change --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 0bee4af..2689780 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -15,7 +15,7 @@ services: PGPASSWORD: "${POSTGRES_PASSWORD}" POSTGRES_HOST_AUTH_METHOD: "${POSTGRES_HOST_AUTH_METHOD:-trust}" worker: - image: "citusdata/citus:10.1.2" + image: "citusdata/citus:10.2.1" labels: ["com.citusdata.role=Worker"] depends_on: [manager] environment: *AUTH