Skip to content

Commit 3e6a1da

Browse files
committedAug 9, 2024·
add ARM64 docker image
Signed-off-by: Slach <[email protected]>
1 parent 0af7f2a commit 3e6a1da

File tree

4 files changed

+13
-11
lines changed

4 files changed

+13
-11
lines changed
 

‎.dockerignore

+2
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,5 @@
33
.vagrant/
44
flame-graphs/
55
dist/
6+
docs/
7+
docker/clickhouse/

‎docker-compose.yml

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
version: '2'
21
services:
32
clickhouse:
43
image: clickhouse/clickhouse-server:latest
@@ -7,13 +6,12 @@ services:
76
- ./docker/clickhouse/tls.xml:/etc/clickhouse-server/config.d/tls.xml
87
- ./docker/clickhouse/ssl/:/etc/clickhouse-server/ssl/
98
ports:
10-
- 8123:8123
11-
- 8443:8443
9+
- "8123:8123"
10+
- "8443:8443"
1211
clickhouse-flamegraph:
1312
image: clickhousepro/clickhouse-flamegraph
1413
volumes:
1514
- ./:/go/src/github.com/Slach/clickhouse-flamegraph
16-
- /tmp/:/tmp/
1715
build:
1816
context: .
1917
dockerfile: docker/clickhouse-flamegraph/Dockerfile

‎docker/clickhouse-flamegraph/Dockerfile

+7-5
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
1-
FROM golang:alpine AS builder
2-
MAINTAINER Eugene Klimov <bloodjazman@gmail.com>
3-
1+
FROM --platform=$BUILDPLATFORM golang:alpine AS builder
2+
ARG TARGETPLATFORM
3+
LABEL maintainer="Eugene Klimov <bloodjazman@gmail.com>"
4+
USER root
45
COPY ./ /go/src/github.com/Slach/clickhouse-flamegraph
56
WORKDIR /go/src/github.com/Slach/clickhouse-flamegraph
67
RUN go mod tidy
7-
RUN go build -o /usr/bin/clickhouse-flamegraph main.go
8+
RUN --mount=type=cache,id=clickhouse-flamegraph-gobuild,target=/root/ go mod download -x
9+
RUN --mount=type=cache,id=clickhouse-flamegraph-gobuild,target=/root/ GOOS=$( echo ${TARGETPLATFORM} | cut -d "/" -f 1) GOARCH=$( echo ${TARGETPLATFORM} | cut -d "/" -f 2) go build -o /usr/bin/clickhouse-flamegraph main.go
810
RUN apk --no-cache add git
911
RUN git clone https://github.com/brendangregg/FlameGraph.git /opt/flamegraph/
1012

11-
FROM alpine:3.20
13+
FROM alpine:latest
1214
RUN apk --no-cache add bash tzdata perl
1315
COPY --from=builder /opt/flamegraph /opt/flamegraph
1416
RUN ln -vsf /opt/flamegraph/flamegraph.pl /usr/bin/flamegraph.pl

‎docker/docker-publisher.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ docker login -u ${DOCKER_LOGIN} -p ${DOCKER_PASSWORD} docker.io
55
set -x
66

77
set -xeuo pipefail
8-
docker compose build --pull clickhouse-flamegraph
9-
docker compose push clickhouse-flamegraph
8+
docker buildx build -f docker/clickhouse-flamegraph/Dockerfile --platform=linux/amd64,linux/arm64 --progress plain --pull --push --tag clickhousepro/clickhouse-flamegraph:latest .
9+
1010
echo "docker publishing done"

0 commit comments

Comments
 (0)
Please sign in to comment.