Skip to content

Commit

Permalink
Bump docker to version 13.0.1 (#354)
Browse files Browse the repository at this point in the history
* Update Dockerfiles and workflows to use PostgreSQL 17.2 and version 13.0.0

* Update Dockerfiles to use Citus 13.0 for PostgreSQL installations

* Update Alpine Dockerfile to use PostgreSQL 17.2 and Citus 13.0.0

* Update Alpine Dockerfile to use PostgreSQL 16.6

* updates

* Remove PostgreSQL 14 Dockerfile and update versions for PostgreSQL 15, 16, and Alpine images to 17.2 and Citus to 13.0.1

* Update Alpine Dockerfile to use llvm19 and clang19

* Update Citus to version 13.0.1 and PostgreSQL version variables
  • Loading branch information
m3hm3t authored Feb 6, 2025
1 parent 675edcf commit b7ab62b
Show file tree
Hide file tree
Showing 13 changed files with 39 additions and 32 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/hadolint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:

steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Run hadolint
uses: hadolint/hadolint-action@f988afea3da57ee48710a9795b6bb677cc901183
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/publish_docker_images_cron.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,15 @@ jobs:
image_type:
- latest
- alpine
- postgres_14
- postgres_16
- postgres_15
- nightly
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Clone tools branch
run: git clone -b v0.8.30 --depth=1 https://github.com/citusdata/tools.git tools
run: git clone -b release-13.0 --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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish_docker_images_on_manual.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ jobs:
fail-fast: false
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Clone tools branch
run: git clone -b v0.8.30 --depth=1 https://github.com/citusdata/tools.git tools
run: git clone -b release-13.0 --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
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/publish_docker_images_on_push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,15 @@ jobs:
image_type:
- latest
- alpine
- postgres_16
- postgres_15
- postgres_14
- nightly
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Clone tools branch
run: git clone -b v0.8.30 --depth=1 https://github.com/citusdata/tools.git tools
run: git clone -b release-13.0 --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
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/publish_docker_images_on_tag.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,18 @@ jobs:
image_type:
- latest
- alpine
- postgres_14
- postgres_16
- postgres_15
- nightly
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
ref: master

- name: Clone tools branch
run: git clone -b v0.8.30 --depth=1 https://github.com/citusdata/tools.git tools
run: git clone -b release-13.0 --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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/update_version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Install package dependencies
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.30 --depth=1 https://github.com/citusdata/tools.git tools
run: git clone -b release-13.0 --depth=1 https://github.com/citusdata/tools.git tools

- name: Set git name and email
run: |
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
### citus-docker v13.0.1.docker (February 05,2025) ###

* Bump Citus version to 13.0.1

### citus-docker v12.1.6.docker (November 26,2024) ###

* Bump Citus version to 12.1.6
Expand Down
8 changes: 4 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -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:16.6
ARG VERSION=12.1.6
FROM postgres:17.2
ARG VERSION=13.0.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" \
Expand All @@ -19,9 +19,9 @@ 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-12.1=$CITUS_VERSION \
&& apt-get install -y postgresql-$PG_MAJOR-citus-13.0=$CITUS_VERSION \
postgresql-$PG_MAJOR-hll=2.18.citus-1 \
postgresql-$PG_MAJOR-topn=2.6.0.citus-1 \
postgresql-$PG_MAJOR-topn=2.7.0.citus-1 \
&& apt-get purge -y --auto-remove curl \
&& rm -rf /var/lib/apt/lists/*

Expand Down
8 changes: 4 additions & 4 deletions alpine/Dockerfile
Original file line number Diff line number Diff line change
@@ -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:16.6-alpine
ARG VERSION=12.1.6
FROM postgres:17.2-alpine
ARG VERSION=13.0.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" \
Expand All @@ -21,8 +21,8 @@ RUN apk add --no-cache \
openssl-dev \
ca-certificates \
llvm \
llvm15-dev \
clang15 \
llvm19-dev \
clang19 \
lz4-dev \
zstd-dev \
libxslt-dev \
Expand Down
4 changes: 2 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ version: "3"
services:
master:
container_name: "${COMPOSE_PROJECT_NAME:-citus}_master"
image: "citusdata/citus:12.1.6"
image: "citusdata/citus:13.0.1"
ports: ["${COORDINATOR_EXTERNAL_PORT:-5432}:5432"]
labels: ["com.citusdata.role=Master"]
environment: &AUTH
Expand All @@ -15,7 +15,7 @@ services:
PGPASSWORD: "${POSTGRES_PASSWORD}"
POSTGRES_HOST_AUTH_METHOD: "${POSTGRES_HOST_AUTH_METHOD:-trust}"
worker:
image: "citusdata/citus:12.1.6"
image: "citusdata/citus:13.0.1"
labels: ["com.citusdata.role=Worker"]
depends_on: [manager]
environment: *AUTH
Expand Down
1 change: 1 addition & 0 deletions pkgvars
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
postgres_17_version=17.2
postgres_16_version=16.6
postgres_15_version=15.10
postgres_14_version=14.15
Expand Down
6 changes: 3 additions & 3 deletions postgres-15/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# This file is auto generated from it's template,
# see citusdata/tools/packaging_automation/templates/docker/postgres-15/postgres-15.tmpl.dockerfile.
FROM postgres:15.10
ARG VERSION=12.1.6
ARG VERSION=13.0.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" \
Expand All @@ -19,9 +19,9 @@ 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-12.1=$CITUS_VERSION \
&& apt-get install -y postgresql-$PG_MAJOR-citus-13.0=$CITUS_VERSION \
postgresql-$PG_MAJOR-hll=2.18.citus-1 \
postgresql-$PG_MAJOR-topn=2.6.0.citus-1 \
postgresql-$PG_MAJOR-topn=2.7.0.citus-1 \
&& apt-get purge -y --auto-remove curl \
&& rm -rf /var/lib/apt/lists/*

Expand Down
10 changes: 5 additions & 5 deletions postgres-14/Dockerfile → postgres-16/Dockerfile
Original file line number Diff line number Diff line change
@@ -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.15
ARG VERSION=12.1.6
# see citusdata/tools/packaging_automation/templates/docker/postgres-16/postgres-16.tmpl.dockerfile.
FROM postgres:16.6
ARG VERSION=13.0.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" \
Expand All @@ -19,9 +19,9 @@ 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-12.1=$CITUS_VERSION \
&& apt-get install -y postgresql-$PG_MAJOR-citus-13.0=$CITUS_VERSION \
postgresql-$PG_MAJOR-hll=2.18.citus-1 \
postgresql-$PG_MAJOR-topn=2.6.0.citus-1 \
postgresql-$PG_MAJOR-topn=2.7.0.citus-1 \
&& apt-get purge -y --auto-remove curl \
&& rm -rf /var/lib/apt/lists/*

Expand Down

0 comments on commit b7ab62b

Please sign in to comment.