diff --git a/.github/workflows/publish_docker_images_cron.yml b/.github/workflows/publish_docker_images_cron.yml index 55275a5..1b667d6 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_17 - - postgres_16 + - postgres_18 - nightly steps: - name: Checkout repository @@ -33,7 +33,7 @@ jobs: uses: docker/setup-buildx-action@v3 - name: Clone tools branch - run: git clone -b v0.8.38 --depth=1 https://github.com/citusdata/tools.git tools + run: git clone -b v0.8.39 --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 3fcac1d..e947210 100644 --- a/.github/workflows/publish_docker_images_on_manual.yml +++ b/.github/workflows/publish_docker_images_on_manual.yml @@ -32,7 +32,7 @@ jobs: uses: docker/setup-buildx-action@v3 - name: Clone tools branch - run: git clone -b v0.8.38 --depth=1 https://github.com/citusdata/tools.git tools + run: git clone -b v0.8.39 --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 ea79e7f..2a4624a 100644 --- a/.github/workflows/publish_docker_images_on_push.yml +++ b/.github/workflows/publish_docker_images_on_push.yml @@ -18,7 +18,7 @@ jobs: - latest - alpine - postgres_17 - - postgres_16 + - postgres_18 - nightly steps: - name: Checkout repository @@ -31,7 +31,7 @@ jobs: uses: docker/setup-buildx-action@v3 - name: Clone tools branch - run: git clone -b v0.8.38 --depth=1 https://github.com/citusdata/tools.git tools + run: git clone -b v0.8.39 --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 f2d1a69..cd86ebe 100644 --- a/.github/workflows/publish_docker_images_on_tag.yml +++ b/.github/workflows/publish_docker_images_on_tag.yml @@ -18,7 +18,7 @@ jobs: - latest - alpine - postgres_17 - - postgres_16 + - postgres_18 - nightly steps: - name: Checkout repository @@ -34,7 +34,7 @@ jobs: uses: docker/setup-buildx-action@v3 - name: Clone tools branch - run: git clone -b v0.8.38 --depth=1 https://github.com/citusdata/tools.git tools + run: git clone -b v0.8.39 --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 41d3706..5899586 100644 --- a/.github/workflows/update_version.yml +++ b/.github/workflows/update_version.yml @@ -44,7 +44,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.36 --depth=1 https://github.com/citusdata/tools.git tools + run: git clone -b v0.8.39 --depth=1 https://github.com/citusdata/tools.git tools - name: Set git name and email run: | diff --git a/pkgvars b/pkgvars index e5dc14b..3d8d364 100644 --- a/pkgvars +++ b/pkgvars @@ -1,5 +1,4 @@ postgres_19_version=19beta3 postgres_18_version=18.4 postgres_17_version=17.10 -postgres_16_version=16.14 diff --git a/postgres-16/Dockerfile b/postgres-16/Dockerfile deleted file mode 100644 index 2e6ee44..0000000 --- a/postgres-16/Dockerfile +++ /dev/null @@ -1,42 +0,0 @@ -# This file is auto generated from it's template, -# see citusdata/tools/packaging_automation/templates/docker/postgres-16/postgres-16.tmpl.dockerfile. -FROM postgres:16.14 -ARG VERSION=14.2.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-14.2=$CITUS_VERSION \ - postgresql-$PG_MAJOR-hll=2.19.citus-1 \ - postgresql-$PG_MAJOR-topn=2.7.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-18/Dockerfile b/postgres-18/Dockerfile index adceaca..a25c5b4 100644 --- a/postgres-18/Dockerfile +++ b/postgres-18/Dockerfile @@ -1,7 +1,7 @@ # This file is auto generated from it's template, # see citusdata/tools/packaging_automation/templates/docker/postgres-18/postgres-18.tmpl.dockerfile. FROM postgres:18.4 -ARG VERSION=14.1.0 +ARG VERSION=14.2.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-14.1=$CITUS_VERSION \ + && apt-get install -y postgresql-$PG_MAJOR-citus-14.2=$CITUS_VERSION \ postgresql-$PG_MAJOR-hll=2.21.citus-1 \ postgresql-$PG_MAJOR-topn=2.7.1.citus-1 \ && apt-get purge -y --auto-remove curl \