From 440caeb0adecd11722981230a5327a6e805ab805 Mon Sep 17 00:00:00 2001
From: ajayk <ajaykemparaj@gmail.com>
Date: Tue, 13 Feb 2024 00:11:00 -0800
Subject: [PATCH 1/3] clickhouse: add docker entrypoint

---
 clickhouse.yaml | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/clickhouse.yaml b/clickhouse.yaml
index 00cc0ab71e7..427736b8fad 100644
--- a/clickhouse.yaml
+++ b/clickhouse.yaml
@@ -1,7 +1,7 @@
 package:
   name: clickhouse
   version: 24.1.3.31
-  epoch: 0
+  epoch: 1
   description: ClickHouse is the fastest and most resource efficient open-source database for real-time apps and analytics.
   copyright:
     - license: Apache-2.0
@@ -56,10 +56,15 @@ pipeline:
   - runs: |
       cd build
       ninja -j $(nproc)
+      mkdir -p ${{targets.destdir}}/etc/clickhouse-server/config.d/
+      mkdir -p  ${{targets.destdir}}/var/lib/clickhouse
+      mkdir -p  ${{targets.destdir}}/var/log/clickhouse-server
       DESTDIR=${{targets.destdir}} ninja install
-
       rm -rf ${{targets.destdir}}/usr/lib/debug
 
+      install -Dm755 ../docker/server/entrypoint.sh ${{targets.destdir}}/entrypoint.sh
+      cp  ../docker/server/docker_related_config.xml ${{targets.destdir}}/etc/clickhouse-server/config.d/docker_related_config.xml
+
   - uses: strip
 
 subpackages:

From b7d46265570c86c71749c25c54a05840c8534d2a Mon Sep 17 00:00:00 2001
From: ajayk <ajaykemparaj@gmail.com>
Date: Mon, 19 Feb 2024 12:22:43 -0800
Subject: [PATCH 2/3] add compat package for clickhouse

---
 clickhouse.yaml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/clickhouse.yaml b/clickhouse.yaml
index d2b2157c4c4..ac6de7177c2 100644
--- a/clickhouse.yaml
+++ b/clickhouse.yaml
@@ -79,7 +79,14 @@ subpackages:
       - runs: |
           mkdir -p ${{targets.subpkgdir}}/usr/share/bash-completion/completions
           mv ${{targets.destdir}}/usr/share/bash-completion/completions/clickhouse ${{targets.subpkgdir}}/usr/share/bash-completion/completions
-    
+
+  - name: "clickhouse-compat"
+    description: "docker compat for clickhouse"
+    pipeline:
+      - runs: |
+          mv ${{targets.destdir}}/entrypoint.sh ${{targets.subpkgdir}}/entrypoint.sh
+          mkdir -p ${{targets.subpkgdir}}/etc/clickhouse-server/config.d/
+          mv ${{targets.destdir}}/etc/clickhouse-server/config.d/docker_related_config.xml ${{targets.subpkgdir}}/etc/clickhouse-server/config.d/docker_related_config.xml
 
 update:
   enabled: true

From 7a6ecced6ed5581ac8899709754f95d53c441ec0 Mon Sep 17 00:00:00 2001
From: ajayk <ajaykemparaj@gmail.com>
Date: Mon, 19 Feb 2024 16:30:08 -0800
Subject: [PATCH 3/3] add compat package for clickhouse

---
 clickhouse.yaml | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/clickhouse.yaml b/clickhouse.yaml
index ac6de7177c2..bf27c95730a 100644
--- a/clickhouse.yaml
+++ b/clickhouse.yaml
@@ -56,15 +56,11 @@ pipeline:
   - runs: |
       cd build
       ninja -j $(nproc)
-      mkdir -p ${{targets.destdir}}/etc/clickhouse-server/config.d/
       mkdir -p  ${{targets.destdir}}/var/lib/clickhouse
       mkdir -p  ${{targets.destdir}}/var/log/clickhouse-server
       DESTDIR=${{targets.destdir}} ninja install
       rm -rf ${{targets.destdir}}/usr/lib/debug
 
-      install -Dm755 ../docker/server/entrypoint.sh ${{targets.destdir}}/entrypoint.sh
-      cp  ../docker/server/docker_related_config.xml ${{targets.destdir}}/etc/clickhouse-server/config.d/docker_related_config.xml
-
   - uses: strip
 
 subpackages:
@@ -84,9 +80,10 @@ subpackages:
     description: "docker compat for clickhouse"
     pipeline:
       - runs: |
-          mv ${{targets.destdir}}/entrypoint.sh ${{targets.subpkgdir}}/entrypoint.sh
+          cd build
+          install -Dm755 ../docker/server/entrypoint.sh ${{targets.subpkgdir}}/entrypoint.sh
           mkdir -p ${{targets.subpkgdir}}/etc/clickhouse-server/config.d/
-          mv ${{targets.destdir}}/etc/clickhouse-server/config.d/docker_related_config.xml ${{targets.subpkgdir}}/etc/clickhouse-server/config.d/docker_related_config.xml
+          cp  ../docker/server/docker_related_config.xml ${{targets.subpkgdir}}/etc/clickhouse-server/config.d/docker_related_config.xml
 
 update:
   enabled: true