From 837da6fb9f9eee06c330d34bdb2484646b516e19 Mon Sep 17 00:00:00 2001
From: Slach <bloodjazman@gmail.com>
Date: Fri, 9 Aug 2024 22:57:25 +0400
Subject: [PATCH] update Dockerfile and Makefile to speedup cross-plaform
 building, actualize ChangeLog.md

---
 ChangeLog.md | 7 +++++++
 Dockerfile   | 2 +-
 Makefile     | 4 ++--
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/ChangeLog.md b/ChangeLog.md
index c69077ca..b39eb22d 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,3 +1,10 @@
+# v2.5.27
+IMPROVEMENTS
+- update Dockerfile and Makefile to speedup cross-plaform building
+
+BUG FIXES
+- update clickhouse-go/v2, try fix [970](https://github.com/Altinity/clickhouse-backup/issues/970)
+
 # v2.5.26
 BUG FIXES
 - fix corner cases when /var/lib/clickhouse/access already broken, fix [977](https://github.com/Altinity/clickhouse-backup/issues/977)
diff --git a/Dockerfile b/Dockerfile
index 6c2096d8..5a2ea142 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@
 ARG CLICKHOUSE_VERSION=latest
 ARG CLICKHOUSE_IMAGE=clickhouse/clickhouse-server
 
-FROM ${CLICKHOUSE_IMAGE}:${CLICKHOUSE_VERSION} AS builder-base
+FROM --platform=$BUILDPLATFORM ${CLICKHOUSE_IMAGE}:${CLICKHOUSE_VERSION} AS builder-base
 USER root
 # TODO remove ugly workaround for musl, https://www.perplexity.ai/search/2ead4c04-060a-4d78-a75f-f26835238438
 RUN rm -fv /etc/apt/sources.list.d/clickhouse.list && \
diff --git a/Makefile b/Makefile
index e7ac7f34..9343e42d 100644
--- a/Makefile
+++ b/Makefile
@@ -156,7 +156,7 @@ build-docker:
 			--tag $(NAME):build-docker --target make-build-docker --progress plain --load . && \
 		mkdir -pv ./build && \
 		DOCKER_ID=$$(docker create $(NAME):build-docker) && \
-		docker cp $${DOCKER_ID}:/src/build/ ./build/ && \
+		docker cp $${DOCKER_ID}:/src/build/. ./build/ && \
 		docker rm -f "$${DOCKER_ID}"'
 
 build-fips-docker:
@@ -164,5 +164,5 @@ build-fips-docker:
 			--tag $(NAME):build-docker-fips --target make-build-fips --progress plain --load . && \
 		mkdir -pv ./build && \
 		DOCKER_ID=$$(docker create $(NAME):build-docker) && \
-		docker cp $${DOCKER_ID}:/src/build/ ./build/ && \
+		docker cp $${DOCKER_ID}:/src/build/. ./build/ && \
 		docker rm -f "$${DOCKER_ID}"'