Skip to content

Commit

Permalink
update Dockerfile and Makefile to speedup cross-plaform building, act…
Browse files Browse the repository at this point in the history
…ualize ChangeLog.md
  • Loading branch information
Slach committed Aug 9, 2024
1 parent 5f05458 commit 837da6f
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 3 deletions.
7 changes: 7 additions & 0 deletions ChangeLog.md
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 && \
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -156,13 +156,13 @@ 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:
bash -xce 'docker buildx build --build-arg CLICKHOUSE_VERSION=$${CLICKHOUSE_VERSION:-latest} --build-arg CLICKHOUSE_IMAGE=$${CLICKHOUSE_IMAGE:-clickhouse/clickhouse-server} --build-arg VERSION=$(VERSION) \
--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}"'

0 comments on commit 837da6f

Please sign in to comment.