Unify keeper.Dockerfile and clickhouse.Dockerfile

This solves issues with keeper on 22.X

docker-compose/base_os/README.md

@@ -2,6 +2,13 @@
 
 These files install ClickHouse and test dependencies.
 
-`clickhouse.Dockerfile` and `keeper.Dockerfile` are special, they are used with docker releases of ClickHouse, and thus only install test dependencies.
+`clickhouse.Dockerfile` is special, it is used with docker releases of ClickHouse server and keeper, and thus only installs test dependencies.
 
 Adding support for a new distribution is simple, make a copy of the most closely related Dockerfile, name it accordingly, and adjust it as necessary.
+
+You can get the correct name with the following python snippet:
+
+```python
+>>> "docker://redhat/ubi9:9.4".split("//")[-1].split(":")[0].split("/")[-1] + ".Dockerfile"
+'ubi9.Dockerfile'
+```

docker-compose/base_os/clickhouse.Dockerfile

@@ -4,6 +4,9 @@ FROM $CLICKHOUSE_DOCKER_IMAGE_NAME
 ENV TZ=Europe/Berlin
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
+# Fix for 22.x keeper
+RUN mkdir -p /var/lib/clickhouse/coordination
+
 # install curl, base image could be alpine
 RUN if [ -f /etc/alpine-release ]; then \
     apk update && \

docker-compose/keeper-service.yml

@@ -6,7 +6,7 @@ services:
     pull_policy: never
     build:
       context: ..
-      dockerfile: docker-compose/base_os/${CLICKHOUSE_TESTS_KEEPER_BASE_OS_NAME:-keeper}.Dockerfile
+      dockerfile: docker-compose/base_os/${CLICKHOUSE_TESTS_KEEPER_BASE_OS_NAME:-clickhouse}.Dockerfile
       args:
         KEEPER_DOCKER_IMAGE: $CLICKHOUSE_TESTS_KEEPER_DOCKER_IMAGE
         CLICKHOUSE_PACKAGE: $CLICKHOUSE_TESTS_KEEPER_BIN_PATH

helpers/cluster.py

@@ -1904,7 +1904,7 @@ def up(self, timeout=30 * 60):
                 )
                 self.environ["CLICKHOUSE_TESTS_KEEPER_BASE_OS"] = self.keeper_base_os
                 self.environ["CLICKHOUSE_TESTS_KEEPER_BASE_OS_NAME"] = (
-                    "keeper"
+                    "clickhouse"
                     if not self.keeper_base_os
                     else self.keeper_base_os.split(":")[0].split("/")[-1]
                 )