From ac1f44f89a1f0685ce343e7613e910e622468d9d Mon Sep 17 00:00:00 2001 From: Adam Rutkowski Date: Thu, 9 Feb 2023 08:11:03 +0100 Subject: [PATCH] Bump clickhouse images to 22.8.13.20-alpine (prod/CI) (#2660) * Bump clickhouse images to 22.8.13.20-alpine (prod/CI) * !fixup * Remove clickhouse-ci target --- .github/workflows/elixir.yml | 2 +- Makefile | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/elixir.yml b/.github/workflows/elixir.yml index 79de048e1..2b80d880d 100644 --- a/.github/workflows/elixir.yml +++ b/.github/workflows/elixir.yml @@ -29,7 +29,7 @@ jobs: --health-retries 5 clickhouse: - image: yandex/clickhouse-server:21.11 + image: clickhouse/clickhouse-server:22.8.13.20-alpine ports: - 8123:8123 env: diff --git a/Makefile b/Makefile index cfd922fa3..6d160559b 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -.PHONY: help install server clickhouse clickhouse-prod clickhouse-ci clickhouse-stop postgres postgres-prod postgres-stop +.PHONY: help install server clickhouse clickhouse-prod clickhouse-stop postgres postgres-prod postgres-stop help: @perl -nle'print $& if m{^[a-zA-Z_-]+:.*?## .*$$}' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}' @@ -21,10 +21,7 @@ clickhouse: ## Start a container with a recent version of clickhouse docker run $(CH_FLAGS) --volume=$$PWD/.clickhouse_db_vol:/var/lib/clickhouse clickhouse/clickhouse-server:22.9-alpine clickhouse-prod: ## Start a container with the same version of clickhouse as the one in prod - docker run $(CH_FLAGS) --volume=$$PWD/.clickhouse_db_vol_prod:/var/lib/clickhouse clickhouse/clickhouse-server:21.11.3.6 - -clickhouse-ci: ## Start a container with the same version of clickhouse as the one in .github/workflows/elixir.yml - docker run $(CH_FLAGS) --volume=$$PWD/.clickhouse_db_vol_ci:/var/lib/clickhouse yandex/clickhouse-server:21.11 + docker run $(CH_FLAGS) --volume=$$PWD/.clickhouse_db_vol_prod:/var/lib/clickhouse clickhouse/clickhouse-server:22.8.13.20-alpine clickhouse-stop: ## Stop and remove the clickhouse container docker stop plausible_clickhouse && docker rm plausible_clickhouse