Skip to content

Commit e81fe9a

Browse files
tabokieti-chi-bot
andauthored
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]>
1 parent 26e099c commit e81fe9a

File tree

4 files changed

+7
-4
lines changed

4 files changed

+7
-4
lines changed

Dockerfile

+4-4
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,9 @@ COPY Cargo.lock ./Cargo.lock
6868

6969
COPY --from=prepare /output/ ./
7070

71-
RUN mkdir -p ./cmd/src/bin && \
72-
echo 'fn main() {}' > ./cmd/src/bin/tikv-ctl.rs && \
73-
echo 'fn main() {}' > ./cmd/src/bin/tikv-server.rs && \
71+
RUN mkdir -p ./cmd/tikv-ctl/src ./cmd/tikv-server/src && \
72+
echo 'fn main() {}' > ./cmd/tikv-ctl/src/main.rs && \
73+
echo 'fn main() {}' > ./cmd/tikv-server/src/main.rs && \
7474
for cargotoml in $(find . -type f -name "Cargo.toml"); do \
7575
sed -i '/fuzz/d' ${cargotoml} && \
7676
sed -i '/profiler/d' ${cargotoml} ; \
@@ -107,4 +107,4 @@ COPY --from=builder /tikv/target/release/tikv-ctl /tikv-ctl
107107

108108
EXPOSE 20160 20180
109109

110-
ENTRYPOINT ["/tikv-server"]
110+
ENTRYPOINT ["/tikv-server"]

components/cdc/Cargo.toml

+1
Original file line numberDiff line numberDiff line change
@@ -76,4 +76,5 @@ required-features = ["failpoints"]
7676

7777
[[bench]]
7878
name = "cdc_event"
79+
path = "benches/cdc_event.rs"
7980
harness = false

components/external_storage/export/Cargo.toml

+2
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ publish = false
66

77
[[bin]]
88
name = "tikv-cloud-storage"
9+
path = "src/bin/tikv-cloud-storage.rs"
910
required-features = ["cloud-storage-grpc"]
1011

1112
[lib]
@@ -84,6 +85,7 @@ tokio = { version = "1.5", features = ["time"] }
8485

8586
[[example]]
8687
name = "scli"
88+
path = "examples/scli.rs"
8789

8890
[target.'cfg(unix)'.dependencies]
8991
nix = { optional = true, version = "0.11" }

0 commit comments

Comments
 (0)