From 1cb59c909aee3ceda8f55b4c0a61ba5328c5dce1 Mon Sep 17 00:00:00 2001 From: zzm Date: Mon, 22 Aug 2022 22:33:37 +0800 Subject: [PATCH] [close #207] cdc: modify ticdc dockerfile for tikv-cdc (#208) * modify dockerfile Signed-off-by: zeminzhou * fix comment: Signed-off-by: zeminzhou Signed-off-by: zeminzhou Co-authored-by: Ping Yu --- cdc/deployments/ticdc/docker/Dockerfile | 12 ------------ cdc/deployments/ticdc/docker/dev.Dockerfile | 15 --------------- .../configs/canal-test-config.toml | 0 .../configs/enable-oldvalue-config.toml | 0 .../configs/jdbc-sink-connector.json | 0 .../docker-compose/configs/pd.toml | 0 .../docker-compose/configs/tidb.toml | 0 .../docker-compose/configs/tikv.toml | 0 .../docker-compose/docker-compose-avro.yml | 0 .../docker-compose/docker-compose-canal.yml | 0 .../docker-compose-kafka-integration.yml | 0 .../docker-compose-mysql-integration.yml | 0 .../docker-compose/docker-compose-mysql.yml | 0 .../{ticdc => tikv-cdc}/docker/.dockerignore | 0 cdc/deployments/tikv-cdc/docker/Dockerfile | 14 ++++++++++++++ cdc/deployments/tikv-cdc/docker/dev.Dockerfile | 17 +++++++++++++++++ .../docker/integration-test.Dockerfile | 0 17 files changed, 31 insertions(+), 27 deletions(-) delete mode 100644 cdc/deployments/ticdc/docker/Dockerfile delete mode 100644 cdc/deployments/ticdc/docker/dev.Dockerfile rename cdc/deployments/{ticdc => tikv-cdc}/docker-compose/configs/canal-test-config.toml (100%) rename cdc/deployments/{ticdc => tikv-cdc}/docker-compose/configs/enable-oldvalue-config.toml (100%) rename cdc/deployments/{ticdc => tikv-cdc}/docker-compose/configs/jdbc-sink-connector.json (100%) rename cdc/deployments/{ticdc => tikv-cdc}/docker-compose/configs/pd.toml (100%) rename cdc/deployments/{ticdc => tikv-cdc}/docker-compose/configs/tidb.toml (100%) rename cdc/deployments/{ticdc => tikv-cdc}/docker-compose/configs/tikv.toml (100%) rename cdc/deployments/{ticdc => tikv-cdc}/docker-compose/docker-compose-avro.yml (100%) rename cdc/deployments/{ticdc => tikv-cdc}/docker-compose/docker-compose-canal.yml (100%) rename cdc/deployments/{ticdc => tikv-cdc}/docker-compose/docker-compose-kafka-integration.yml (100%) rename cdc/deployments/{ticdc => tikv-cdc}/docker-compose/docker-compose-mysql-integration.yml (100%) rename cdc/deployments/{ticdc => tikv-cdc}/docker-compose/docker-compose-mysql.yml (100%) rename cdc/deployments/{ticdc => tikv-cdc}/docker/.dockerignore (100%) create mode 100644 cdc/deployments/tikv-cdc/docker/Dockerfile create mode 100644 cdc/deployments/tikv-cdc/docker/dev.Dockerfile rename cdc/deployments/{ticdc => tikv-cdc}/docker/integration-test.Dockerfile (100%) diff --git a/cdc/deployments/ticdc/docker/Dockerfile b/cdc/deployments/ticdc/docker/Dockerfile deleted file mode 100644 index f8917bcb..00000000 --- a/cdc/deployments/ticdc/docker/Dockerfile +++ /dev/null @@ -1,12 +0,0 @@ -FROM golang:1.16-alpine as builder -RUN apk add --no-cache git make bash -WORKDIR /go/src/github.com/pingcap/tiflow -COPY . . -ENV CDC_ENABLE_VENDOR=0 -RUN make - -FROM alpine:3.12 -RUN apk add --no-cache tzdata bash curl socat -COPY --from=builder /go/src/github.com/pingcap/tiflow/bin/cdc /cdc -EXPOSE 8300 -CMD [ "/cdc" ] diff --git a/cdc/deployments/ticdc/docker/dev.Dockerfile b/cdc/deployments/ticdc/docker/dev.Dockerfile deleted file mode 100644 index 1d01bf9c..00000000 --- a/cdc/deployments/ticdc/docker/dev.Dockerfile +++ /dev/null @@ -1,15 +0,0 @@ -FROM golang:1.16-alpine3.12 as builder -RUN apk add --no-cache git make bash -WORKDIR /go/src/github.com/pingcap/tiflow -COPY . . -ENV CDC_ENABLE_VENDOR=1 -RUN go mod vendor -RUN make failpoint-enable -RUN make cdc -RUN make failpoint-disable - -FROM alpine:3.12 -RUN apk add --no-cache tzdata bash curl socat -COPY --from=builder /go/src/github.com/pingcap/tiflow/bin/cdc /cdc -EXPOSE 8300 -CMD [ "/cdc" ] diff --git a/cdc/deployments/ticdc/docker-compose/configs/canal-test-config.toml b/cdc/deployments/tikv-cdc/docker-compose/configs/canal-test-config.toml similarity index 100% rename from cdc/deployments/ticdc/docker-compose/configs/canal-test-config.toml rename to cdc/deployments/tikv-cdc/docker-compose/configs/canal-test-config.toml diff --git a/cdc/deployments/ticdc/docker-compose/configs/enable-oldvalue-config.toml b/cdc/deployments/tikv-cdc/docker-compose/configs/enable-oldvalue-config.toml similarity index 100% rename from cdc/deployments/ticdc/docker-compose/configs/enable-oldvalue-config.toml rename to cdc/deployments/tikv-cdc/docker-compose/configs/enable-oldvalue-config.toml diff --git a/cdc/deployments/ticdc/docker-compose/configs/jdbc-sink-connector.json b/cdc/deployments/tikv-cdc/docker-compose/configs/jdbc-sink-connector.json similarity index 100% rename from cdc/deployments/ticdc/docker-compose/configs/jdbc-sink-connector.json rename to cdc/deployments/tikv-cdc/docker-compose/configs/jdbc-sink-connector.json diff --git a/cdc/deployments/ticdc/docker-compose/configs/pd.toml b/cdc/deployments/tikv-cdc/docker-compose/configs/pd.toml similarity index 100% rename from cdc/deployments/ticdc/docker-compose/configs/pd.toml rename to cdc/deployments/tikv-cdc/docker-compose/configs/pd.toml diff --git a/cdc/deployments/ticdc/docker-compose/configs/tidb.toml b/cdc/deployments/tikv-cdc/docker-compose/configs/tidb.toml similarity index 100% rename from cdc/deployments/ticdc/docker-compose/configs/tidb.toml rename to cdc/deployments/tikv-cdc/docker-compose/configs/tidb.toml diff --git a/cdc/deployments/ticdc/docker-compose/configs/tikv.toml b/cdc/deployments/tikv-cdc/docker-compose/configs/tikv.toml similarity index 100% rename from cdc/deployments/ticdc/docker-compose/configs/tikv.toml rename to cdc/deployments/tikv-cdc/docker-compose/configs/tikv.toml diff --git a/cdc/deployments/ticdc/docker-compose/docker-compose-avro.yml b/cdc/deployments/tikv-cdc/docker-compose/docker-compose-avro.yml similarity index 100% rename from cdc/deployments/ticdc/docker-compose/docker-compose-avro.yml rename to cdc/deployments/tikv-cdc/docker-compose/docker-compose-avro.yml diff --git a/cdc/deployments/ticdc/docker-compose/docker-compose-canal.yml b/cdc/deployments/tikv-cdc/docker-compose/docker-compose-canal.yml similarity index 100% rename from cdc/deployments/ticdc/docker-compose/docker-compose-canal.yml rename to cdc/deployments/tikv-cdc/docker-compose/docker-compose-canal.yml diff --git a/cdc/deployments/ticdc/docker-compose/docker-compose-kafka-integration.yml b/cdc/deployments/tikv-cdc/docker-compose/docker-compose-kafka-integration.yml similarity index 100% rename from cdc/deployments/ticdc/docker-compose/docker-compose-kafka-integration.yml rename to cdc/deployments/tikv-cdc/docker-compose/docker-compose-kafka-integration.yml diff --git a/cdc/deployments/ticdc/docker-compose/docker-compose-mysql-integration.yml b/cdc/deployments/tikv-cdc/docker-compose/docker-compose-mysql-integration.yml similarity index 100% rename from cdc/deployments/ticdc/docker-compose/docker-compose-mysql-integration.yml rename to cdc/deployments/tikv-cdc/docker-compose/docker-compose-mysql-integration.yml diff --git a/cdc/deployments/ticdc/docker-compose/docker-compose-mysql.yml b/cdc/deployments/tikv-cdc/docker-compose/docker-compose-mysql.yml similarity index 100% rename from cdc/deployments/ticdc/docker-compose/docker-compose-mysql.yml rename to cdc/deployments/tikv-cdc/docker-compose/docker-compose-mysql.yml diff --git a/cdc/deployments/ticdc/docker/.dockerignore b/cdc/deployments/tikv-cdc/docker/.dockerignore similarity index 100% rename from cdc/deployments/ticdc/docker/.dockerignore rename to cdc/deployments/tikv-cdc/docker/.dockerignore diff --git a/cdc/deployments/tikv-cdc/docker/Dockerfile b/cdc/deployments/tikv-cdc/docker/Dockerfile new file mode 100644 index 00000000..67d66100 --- /dev/null +++ b/cdc/deployments/tikv-cdc/docker/Dockerfile @@ -0,0 +1,14 @@ +FROM golang:1.18.0-alpine3.15 as builder +RUN apk add --no-cache git make bash +WORKDIR /go/src/github.com/tikv/migration/cdc +COPY . . +ENV CDC_ENABLE_VENDOR=0 +RUN make release + +FROM alpine:3.15 +RUN apk add --no-cache tzdata bash curl socat +COPY --from=builder /go/src/github.com/tikv/migration/cdc/bin/tikv-cdc /usr/bin/ +# TiKV-CDC use TiCDC operator to run TiKV-CDC server, TiCDC operator will use '/cdc' to start server +COPY --from=builder /go/src/github.com/tikv/migration/cdc/bin/tikv-cdc /cdc +EXPOSE 8600 +CMD [ "tikv-cdc" ] diff --git a/cdc/deployments/tikv-cdc/docker/dev.Dockerfile b/cdc/deployments/tikv-cdc/docker/dev.Dockerfile new file mode 100644 index 00000000..5a7e85b1 --- /dev/null +++ b/cdc/deployments/tikv-cdc/docker/dev.Dockerfile @@ -0,0 +1,17 @@ +FROM golang:1.18.0-alpine3.15 as builder +RUN apk add --no-cache git make bash +WORKDIR /go/src/github.com/tikv/migration/cdc +COPY . . +ENV CDC_ENABLE_VENDOR=1 +RUN go mod vendor +RUN make failpoint-enable +RUN make +RUN make failpoint-disable + +FROM alpine:3.15 +RUN apk add --no-cache tzdata bash curl socat +COPY --from=builder /go/src/github.com/tikv/migration/cdc/bin/tikv-cdc /usr/bin/ +# TiKV-CDC use TiCDC operator to run TiKV-CDC server, TiCDC operator will use '/cdc' to start server +COPY --from=builder /go/src/github.com/tikv/migration/cdc/bin/tikv-cdc /cdc +EXPOSE 8600 +CMD [ "tikv-cdc" ] diff --git a/cdc/deployments/ticdc/docker/integration-test.Dockerfile b/cdc/deployments/tikv-cdc/docker/integration-test.Dockerfile similarity index 100% rename from cdc/deployments/ticdc/docker/integration-test.Dockerfile rename to cdc/deployments/tikv-cdc/docker/integration-test.Dockerfile