From 139962ea2274e0211ca3e8cf068af42fbb07a34d Mon Sep 17 00:00:00 2001 From: Gurkan Indibay Date: Mon, 17 Jul 2023 09:30:03 +0000 Subject: [PATCH 1/2] Bump docker to version 12.0.0 --- CHANGELOG.md | 4 ++++ Dockerfile | 6 +++--- alpine/Dockerfile | 5 ++--- docker-compose.yml | 4 ++-- postgres-13/Dockerfile | 6 +++--- postgres-14/Dockerfile | 6 +++--- 6 files changed, 17 insertions(+), 14 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 412fd11..03224b1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +### citus-docker v12.0.0.docker (July 17,2023) ### + +* Bump Citus version to 12.0.0 + ### citus-docker v11.3.0.docker (May 02,2023) ### * Bump Citus version to 11.3.0 diff --git a/Dockerfile b/Dockerfile index f743712..3bd7b1a 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:15.3 -ARG VERSION=11.3.0 +FROM postgres:15.2 +ARG VERSION=12.0.0 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.3=$CITUS_VERSION \ + && apt-get install -y postgresql-$PG_MAJOR-citus-12.0=$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 \ diff --git a/alpine/Dockerfile b/alpine/Dockerfile index 7dff914..50e8d59 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:15.2-alpine -ARG VERSION=11.3.0 +ARG VERSION=12.0.0 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 9c96bce..3210908 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.3.0" + image: "citusdata/citus:12.0.0" 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.3.0" + image: "citusdata/citus:12.0.0" labels: ["com.citusdata.role=Worker"] depends_on: [manager] environment: *AUTH diff --git a/postgres-13/Dockerfile b/postgres-13/Dockerfile index 6ade88f..7d25679 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.11 -ARG VERSION=11.3.0 +FROM postgres:13.10 +ARG VERSION=12.0.0 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.3=$CITUS_VERSION \ + && apt-get install -y postgresql-$PG_MAJOR-citus-12.0=$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 \ diff --git a/postgres-14/Dockerfile b/postgres-14/Dockerfile index cb10210..ab4c78a 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.8 -ARG VERSION=11.3.0 +FROM postgres:14.7 +ARG VERSION=12.0.0 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.3=$CITUS_VERSION \ + && apt-get install -y postgresql-$PG_MAJOR-citus-12.0=$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 \ From dba64892def14d225505302a06e766a48fa69dce Mon Sep 17 00:00:00 2001 From: gindibay Date: Mon, 17 Jul 2023 12:36:00 +0300 Subject: [PATCH 2/2] * Removes Postgres 13 * Updates tools version --- .../workflows/publish_docker_images_cron.yml | 3 +- .../publish_docker_images_on_manual.yml | 2 +- .../publish_docker_images_on_push.yml | 1 - .../publish_docker_images_on_tag.yml | 3 +- .github/workflows/update_version.yml | 2 +- Dockerfile | 2 +- alpine/Dockerfile | 5 ++- postgres-13/Dockerfile | 42 ------------------- postgres-14/Dockerfile | 2 +- 9 files changed, 9 insertions(+), 53 deletions(-) delete mode 100644 postgres-13/Dockerfile diff --git a/.github/workflows/publish_docker_images_cron.yml b/.github/workflows/publish_docker_images_cron.yml index 2fa9fdc..5513beb 100644 --- a/.github/workflows/publish_docker_images_cron.yml +++ b/.github/workflows/publish_docker_images_cron.yml @@ -19,7 +19,6 @@ jobs: image_type: - latest - alpine - - postgres_13 - postgres_14 - nightly steps: @@ -27,7 +26,7 @@ jobs: uses: actions/checkout@v3 - name: Clone tools branch - run: git clone -b v0.8.24 --depth=1 https://github.com/citusdata/tools.git tools + run: git clone -b v0.8.27 --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 3600dab..d81998c 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@v3 - name: Clone tools branch - run: git clone -b v0.8.24 --depth=1 https://github.com/citusdata/tools.git tools + run: git clone -b v0.8.27 --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 fe71241..50aaab2 100644 --- a/.github/workflows/publish_docker_images_on_push.yml +++ b/.github/workflows/publish_docker_images_on_push.yml @@ -17,7 +17,6 @@ jobs: image_type: - latest - alpine - - postgres_13 - postgres_14 - nightly steps: diff --git a/.github/workflows/publish_docker_images_on_tag.yml b/.github/workflows/publish_docker_images_on_tag.yml index 13156e0..9d0ba06 100644 --- a/.github/workflows/publish_docker_images_on_tag.yml +++ b/.github/workflows/publish_docker_images_on_tag.yml @@ -17,7 +17,6 @@ jobs: image_type: - latest - alpine - - postgres_13 - postgres_14 - nightly steps: @@ -28,7 +27,7 @@ jobs: ref: master - name: Clone tools branch - run: git clone -b v0.8.24 --depth=1 https://github.com/citusdata/tools.git tools + run: git clone -b v0.8.27 --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 d54833f..9f6d1eb 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.24 --depth=1 https://github.com/citusdata/tools.git tools + run: git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools - name: Set git name and email run: | diff --git a/Dockerfile b/Dockerfile index 3bd7b1a..ee0c6d2 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:15.2 +FROM postgres:15.3 ARG VERSION=12.0.0 LABEL maintainer="Citus Data https://citusdata.com" \ org.label-schema.name="Citus" \ diff --git a/alpine/Dockerfile b/alpine/Dockerfile index 50e8d59..850a66c 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:15.2-alpine +FROM postgres:15.3-alpine ARG VERSION=12.0.0 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 \ diff --git a/postgres-13/Dockerfile b/postgres-13/Dockerfile deleted file mode 100644 index 7d25679..0000000 --- a/postgres-13/Dockerfile +++ /dev/null @@ -1,42 +0,0 @@ -# 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.10 -ARG VERSION=12.0.0 -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-12.0=$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 diff --git a/postgres-14/Dockerfile b/postgres-14/Dockerfile index ab4c78a..e888948 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.7 +FROM postgres:14.8 ARG VERSION=12.0.0 LABEL maintainer="Citus Data https://citusdata.com" \ org.label-schema.name="Citus" \