build: fix make docker on Linux (tikv#11349)

* fix make docker fix tikv#11312 Signed-off-by: tabokie <[email protected]> * fix cargo Signed-off-by: tabokie <[email protected]> Co-authored-by: Ti Chi Robot <[email protected]>
Long-Live-the-DoDo · Nov 19, 2021 · e81fe9a · e81fe9a
1 parent 26e099c
commit e81fe9a
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -68,9 +68,9 @@ COPY Cargo.lock ./Cargo.lock
 
 COPY --from=prepare /output/ ./
 
-RUN mkdir -p ./cmd/src/bin && \
-    echo 'fn main() {}' > ./cmd/src/bin/tikv-ctl.rs && \
-    echo 'fn main() {}' > ./cmd/src/bin/tikv-server.rs && \
+RUN mkdir -p ./cmd/tikv-ctl/src ./cmd/tikv-server/src && \
+    echo 'fn main() {}' > ./cmd/tikv-ctl/src/main.rs && \
+    echo 'fn main() {}' > ./cmd/tikv-server/src/main.rs && \
     for cargotoml in $(find . -type f -name "Cargo.toml"); do \
         sed -i '/fuzz/d' ${cargotoml} && \
         sed -i '/profiler/d' ${cargotoml} ; \
@@ -107,4 +107,4 @@ COPY --from=builder /tikv/target/release/tikv-ctl /tikv-ctl
 
 EXPOSE 20160 20180
 
-ENTRYPOINT ["/tikv-server"]
+ENTRYPOINT ["/tikv-server"]
diff --git a/components/cdc/Cargo.toml b/components/cdc/Cargo.toml
@@ -76,4 +76,5 @@ required-features = ["failpoints"]
 
 [[bench]]
 name = "cdc_event"
+path = "benches/cdc_event.rs"
 harness = false
diff --git a/components/cdc/benches/cdc_event/main.rs → components/cdc/benches/cdc_event.rs b/components/cdc/benches/cdc_event/main.rs → components/cdc/benches/cdc_event.rs
diff --git a/components/external_storage/export/Cargo.toml b/components/external_storage/export/Cargo.toml
@@ -6,6 +6,7 @@ publish = false
 
 [[bin]]
 name = "tikv-cloud-storage"
+path = "src/bin/tikv-cloud-storage.rs"
 required-features = ["cloud-storage-grpc"]
 
 [lib]
@@ -84,6 +85,7 @@ tokio = { version = "1.5", features = ["time"] }
 
 [[example]]
 name = "scli"
+path = "examples/scli.rs"
 
 [target.'cfg(unix)'.dependencies]
 nix = { optional = true, version = "0.11" }