Merge a6aea2d into 1d8847b

tikv · Aug 19, 2022 · 88c3d2f · 88c3d2f
2 parents 1d8847b + a6aea2d
commit 88c3d2f
Show file tree

Hide file tree

Showing 17 changed files with 31 additions and 27 deletions.
diff --git a/cdc/deployments/ticdc/docker/Dockerfile b/cdc/deployments/ticdc/docker/Dockerfile
diff --git a/cdc/deployments/ticdc/docker/dev.Dockerfile b/cdc/deployments/ticdc/docker/dev.Dockerfile
diff --git a/...er-compose/configs/canal-test-config.toml → ...er-compose/configs/canal-test-config.toml b/...er-compose/configs/canal-test-config.toml → ...er-compose/configs/canal-test-config.toml
diff --git a/...mpose/configs/enable-oldvalue-config.toml → ...mpose/configs/enable-oldvalue-config.toml b/...mpose/configs/enable-oldvalue-config.toml → ...mpose/configs/enable-oldvalue-config.toml
diff --git a/...-compose/configs/jdbc-sink-connector.json → ...-compose/configs/jdbc-sink-connector.json b/...-compose/configs/jdbc-sink-connector.json → ...-compose/configs/jdbc-sink-connector.json
diff --git a/...ents/ticdc/docker-compose/configs/pd.toml → ...s/tikv-cdc/docker-compose/configs/pd.toml b/...ents/ticdc/docker-compose/configs/pd.toml → ...s/tikv-cdc/docker-compose/configs/pd.toml
diff --git a/...ts/ticdc/docker-compose/configs/tidb.toml → ...tikv-cdc/docker-compose/configs/tidb.toml b/...ts/ticdc/docker-compose/configs/tidb.toml → ...tikv-cdc/docker-compose/configs/tidb.toml
diff --git a/...ts/ticdc/docker-compose/configs/tikv.toml → ...tikv-cdc/docker-compose/configs/tikv.toml b/...ts/ticdc/docker-compose/configs/tikv.toml → ...tikv-cdc/docker-compose/configs/tikv.toml
diff --git a/...dc/docker-compose/docker-compose-avro.yml → ...dc/docker-compose/docker-compose-avro.yml b/...dc/docker-compose/docker-compose-avro.yml → ...dc/docker-compose/docker-compose-avro.yml
diff --git a/...c/docker-compose/docker-compose-canal.yml → ...c/docker-compose/docker-compose-canal.yml b/...c/docker-compose/docker-compose-canal.yml → ...c/docker-compose/docker-compose-canal.yml
diff --git a/...pose/docker-compose-kafka-integration.yml → ...pose/docker-compose-kafka-integration.yml b/...pose/docker-compose-kafka-integration.yml → ...pose/docker-compose-kafka-integration.yml
diff --git a/...pose/docker-compose-mysql-integration.yml → ...pose/docker-compose-mysql-integration.yml b/...pose/docker-compose-mysql-integration.yml → ...pose/docker-compose-mysql-integration.yml
diff --git a/...c/docker-compose/docker-compose-mysql.yml → ...c/docker-compose/docker-compose-mysql.yml b/...c/docker-compose/docker-compose-mysql.yml → ...c/docker-compose/docker-compose-mysql.yml
diff --git a/cdc/deployments/ticdc/docker/.dockerignore → ...deployments/tikv-cdc/docker/.dockerignore b/cdc/deployments/ticdc/docker/.dockerignore → ...deployments/tikv-cdc/docker/.dockerignore
diff --git a/cdc/deployments/tikv-cdc/docker/Dockerfile 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
@@ -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/.../ticdc/docker/integration-test.Dockerfile → ...kv-cdc/docker/integration-test.Dockerfile b/.../ticdc/docker/integration-test.Dockerfile → ...kv-cdc/docker/integration-test.Dockerfile