diff --git a/.github/workflows/publish_docker_images_cron.yml b/.github/workflows/publish_docker_images_cron.yml index 8d9f5c1..2cb2795 100644 --- a/.github/workflows/publish_docker_images_cron.yml +++ b/.github/workflows/publish_docker_images_cron.yml @@ -20,17 +20,17 @@ jobs: - latest - alpine - postgres_12 - - postgres_13 + - postgres_14 - nightly steps: - name: Checkout repository 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 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 6c0d35d..23d9a78 100644 --- a/.github/workflows/publish_docker_images_on_manual.yml +++ b/.github/workflows/publish_docker_images_on_manual.yml @@ -26,10 +26,10 @@ 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 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_push.yml b/.github/workflows/publish_docker_images_on_push.yml index 62d3cf0..52f6810 100644 --- a/.github/workflows/publish_docker_images_on_push.yml +++ b/.github/workflows/publish_docker_images_on_push.yml @@ -20,14 +20,14 @@ jobs: - latest - alpine - postgres_12 - - postgres_13 + - postgres_14 - nightly steps: - name: Checkout repository 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 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 6eb949e..9428ed1 100644 --- a/.github/workflows/update_version.yml +++ b/.github/workflows/update_version.yml @@ -27,10 +27,10 @@ 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.3 --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/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 9ce0f4c..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:14beta3 -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" \ @@ -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.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/docker-compose.yml b/docker-compose.yml index 66123fc..2689780 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 @@ -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 diff --git a/nightly/Dockerfile b/nightly/Dockerfile index 47cce8e..8d0ed92 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" -# switch to Citus nightly +# 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-12/Dockerfile b/postgres-12/Dockerfile index 1c7ca70..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.8 -ARG VERSION=10.2.0 +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" \ @@ -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-13/Dockerfile b/postgres-14/Dockerfile similarity index 91% rename from postgres-13/Dockerfile rename to postgres-14/Dockerfile index 91355c0..3827cb2 100644 --- a/postgres-13/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:13.4 -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" \ @@ -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/*