*: update docker script and Dockerfile (tikv#5764)

Signed-off-by: Neil Shen <[email protected]>

Author: overvenus

.dockerignore

@@ -1,3 +1,39 @@
+
+# OSX leaves these everywhere on SMB shares
+._*
+
+# OSX trash
+.DS_Store
+
+# Eclipse files
+.classpath
+.project
+.settings/**
+
+# Vim swap files
+*.swp
+
+# Files generated by JetBrains IDEs, e.g. IntelliJ IDEA
+.idea/
+*.iml
+out/
+
+# Vscode files
+.vscode/**
+
 target
-# Including .git lets the build inside Docker get the git commit
-# .git
+tmp
+/bin
+
+# fuzzing hack, see fuzz/cli.rs
+fuzz-incremental/
+
+# cargo configuration. We presently use this to create custom cargo profiles
+# that should not be checked in at this location.
+.cargo/
+
+# Files generated by tikv-server
+/LOCK
+/db/
+/last_tikv.toml
+/raft/

Dockerfile

@@ -4,6 +4,8 @@ WORKDIR /tikv
 
 # Install Rust
 COPY rust-toolchain ./
+RUN rustup self update
+RUN rustup set profile minimal
 RUN rustup default nightly-2019-09-05
 
 # Use Makefile to build
@@ -22,21 +24,22 @@ COPY cmd/Cargo.toml ./cmd/
 COPY ./components/backup/Cargo.toml ./components/backup/Cargo.toml
 COPY ./components/codec/Cargo.toml ./components/codec/Cargo.toml
 COPY ./components/engine/Cargo.toml ./components/engine/Cargo.toml
+COPY ./components/engine_rocks/Cargo.toml ./components/engine_rocks/Cargo.toml
+COPY ./components/engine_traits/Cargo.toml ./components/engine_traits/Cargo.toml
 COPY ./components/external_storage/Cargo.toml ./components/external_storage/Cargo.toml
+COPY ./components/keys/Cargo.toml ./components/keys/Cargo.toml
 COPY ./components/log_wrappers/Cargo.toml ./components/log_wrappers/Cargo.toml
 COPY ./components/match_template/Cargo.toml ./components/match_template/Cargo.toml
 COPY ./components/panic_hook/Cargo.toml ./components/panic_hook/Cargo.toml
 COPY ./components/pd_client/Cargo.toml ./components/pd_client/Cargo.toml
+COPY ./components/sst_importer/Cargo.toml ./components/sst_importer/Cargo.toml
 COPY ./components/tidb_query/Cargo.toml ./components/tidb_query/Cargo.toml
 COPY ./components/tidb_query_codegen/Cargo.toml ./components/tidb_query_codegen/Cargo.toml
 COPY ./components/tidb_query_datatype/Cargo.toml ./components/tidb_query_datatype/Cargo.toml
 COPY ./components/tikv_alloc/Cargo.toml ./components/tikv_alloc/Cargo.toml
 COPY ./components/tikv_util/Cargo.toml ./components/tikv_util/Cargo.toml
 COPY ./components/tipb_helper/Cargo.toml ./components/tipb_helper/Cargo.toml
 
-# Remove profiler from tidb_query
-RUN sed -i '/profiler/d' ./components/tidb_query/Cargo.toml
-
 # Create dummy files, build the dependencies
 # then remove TiKV fingerprint for following rebuild
 RUN mkdir -p ./cmd/src/bin && \
@@ -48,11 +51,15 @@ RUN mkdir -p ./cmd/src/bin && \
     mkdir ./components/backup/src && echo '' > ./components/backup/src/lib.rs && \
     mkdir ./components/codec/src && echo '' > ./components/codec/src/lib.rs && \
     mkdir ./components/engine/src && echo '' > ./components/engine/src/lib.rs && \
+    mkdir ./components/engine_rocks/src && echo '' > ./components/engine_rocks/src/lib.rs && \
+    mkdir ./components/engine_traits/src && echo '' > ./components/engine_traits/src/lib.rs && \
     mkdir ./components/external_storage/src && echo '' > ./components/external_storage/src/lib.rs && \
+    mkdir ./components/keys/src && echo '' > ./components/keys/src/lib.rs && \
     mkdir ./components/log_wrappers/src && echo '' > ./components/log_wrappers/src/lib.rs && \
     mkdir ./components/match_template/src && echo '' > ./components/match_template/src/lib.rs && \
     mkdir ./components/panic_hook/src && echo '' > ./components/panic_hook/src/lib.rs && \
     mkdir ./components/pd_client/src && echo '' > ./components/pd_client/src/lib.rs && \
+    mkdir ./components/sst_importer/src && echo '' > ./components/sst_importer/src/lib.rs && \
     mkdir ./components/tidb_query/src && echo '' > ./components/tidb_query/src/lib.rs && \
     mkdir ./components/tidb_query_codegen/src && echo '' > ./components/tidb_query_codegen/src/lib.rs && \
     mkdir ./components/tidb_query_datatype/src && echo '' > ./components/tidb_query_datatype/src/lib.rs && \
@@ -71,11 +78,15 @@ RUN make build_dist_release && \
     rm -rf ./target/release/.fingerprint/backup-* && \
     rm -rf ./target/release/.fingerprint/codec-* && \
     rm -rf ./target/release/.fingerprint/engine-* && \
+    rm -rf ./target/release/.fingerprint/engine_rocks-* && \
+    rm -rf ./target/release/.fingerprint/engine_traits-* && \
     rm -rf ./target/release/.fingerprint/external_storage-* && \
+    rm -rf ./target/release/.fingerprint/keys-* && \
     rm -rf ./target/release/.fingerprint/log_wrappers-* && \
     rm -rf ./target/release/.fingerprint/match_template-* && \
     rm -rf ./target/release/.fingerprint/panic_hook-* && \
     rm -rf ./target/release/.fingerprint/pd_client-* && \
+    rm -rf ./target/release/.fingerprint/sst_importer-* && \
     rm -rf ./target/release/.fingerprint/tidb_query-* && \
     rm -rf ./target/release/.fingerprint/tidb_query_codegen-* && \
     rm -rf ./target/release/.fingerprint/tidb_query_datatype-* && \

Makefile

@@ -240,6 +240,9 @@ ctl:
 expression: format clippy
 	RUST_BACKTRACE=1 cargo test --features "${ENABLE_FEATURES}" --no-default-features --package tidb_query "expr" -- --nocapture
 
+# A special target for building TiKV docker image.
+docker:
+	scripts/gen-dockerfile.sh && docker build .
 
 ## The driver for script/run-cargo.sh
 ## ----------------------------------

scripts/gen-dockerfile.sh

@@ -13,6 +13,8 @@ WORKDIR /tikv
 
 # Install Rust
 COPY rust-toolchain ./
+RUN rustup self update
+RUN rustup set profile minimal
 RUN rustup default $(cat "rust-toolchain")
 
 # Use Makefile to build
@@ -42,9 +44,6 @@ done
 
 cat <<EOT >> ${output}
 
-# Remove profiler from tidb_query
-RUN sed -i '/profiler/d' ./components/tidb_query/Cargo.toml
-
 # Create dummy files, build the dependencies
 # then remove TiKV fingerprint for following rebuild
 RUN mkdir -p ./cmd/src/bin && \\
@@ -99,3 +98,5 @@ EXPOSE 20160 20180
 
 ENTRYPOINT ["/tikv-server"]
 EOT
+
+cat .gitignore > .dockerignore