Skip to content

Commit

Permalink
Bump docker to version 12.0.0 (#342)
Browse files Browse the repository at this point in the history
* Bump docker to version 12.0.0

* * Removes Postgres 13
* Updates tools version
  • Loading branch information
gurkanindibay authored Jul 17, 2023
1 parent 7b86406 commit 22eb14b
Show file tree
Hide file tree
Showing 11 changed files with 16 additions and 57 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/publish_docker_images_cron.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,14 @@ jobs:
image_type:
- latest
- alpine
- postgres_13
- postgres_14
- nightly
steps:
- name: Checkout repository
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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish_docker_images_on_manual.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/publish_docker_images_on_push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ jobs:
image_type:
- latest
- alpine
- postgres_13
- postgres_14
- nightly
steps:
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/publish_docker_images_on_tag.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ jobs:
image_type:
- latest
- alpine
- postgres_13
- postgres_14
- nightly
steps:
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update_version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
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 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
Expand Down
4 changes: 2 additions & 2 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:15.3
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" \
Expand All @@ -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 \
Expand Down
4 changes: 2 additions & 2 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:15.2-alpine
ARG VERSION=11.3.0
FROM postgres:15.3-alpine
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" \
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:11.3.0"
image: "citusdata/citus:12.0.0"
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:11.3.0"
image: "citusdata/citus:12.0.0"
labels: ["com.citusdata.role=Worker"]
depends_on: [manager]
environment: *AUTH
Expand Down
42 changes: 0 additions & 42 deletions postgres-13/Dockerfile

This file was deleted.

4 changes: 2 additions & 2 deletions postgres-14/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.8
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" \
Expand All @@ -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 \
Expand Down

0 comments on commit 22eb14b

Please sign in to comment.