Amend 2-phase docker image building

ben2077 · Jan 2, 2021 · 2b98f7a · 2b98f7a
1 parent 137e049
commit 2b98f7a
Show file tree

Hide file tree

Showing 22 changed files with 110 additions and 179 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,5 @@
 /target
 **/*.rs.bk
-examples/target_volume/
 chaostest/__pycache__/
 chaostest/chaos-docker-compose.yml
 *.pyc

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -32,7 +32,7 @@ serde = "1.0"
 serde_derive = "1.0.88"
 serde_json = "1.0"
 log = "0.4"
-env_logger = "0.6.0"
+env_logger = "0.8.2"
 scopeguard = "1.1.0"
 itertools = "0.8.0"
 futures-batch = "0.6.0"

diff --git a/Makefile b/Makefile
@@ -37,46 +37,13 @@ broker2:
 flame:
 	sudo flamegraph -o $(name).svg target/release/server_proxy conf/server-proxy.toml
 
-# Debug image and release image use different ways for building image.
-# For faster rebuild, builder image will only build the binaries and move it out
-# to the host by shared volume. The debug undermoon image will not get the image
-# when being built. Instead we need to specify the volume to `insert` the binary
-# to the debug undermoon image.
-docker-build-image:
-	docker image build -f examples/Dockerfile-builder -t undermoon_builder .
-	sh scripts/dkrebuild.sh
-	docker image build -f examples/Dockerfile-undermoon -t undermoon .
-
-docker-rebuild-bin:
-	sh scripts/dkrebuild.sh
-
 # Image for testing undermoon-operator
 docker-build-test-image:
-	rm -f examples/target_volume/debug/*
-	rm -f examples/target_volume/release/*
-	docker image build -f examples/Dockerfile-builder-test -t undermoon_builder_test .
-	mkdir -p ./examples/target_volume/debug
-	docker rm undermoon-builder-container-debug || true
-	docker create -it --name undermoon-builder-container-debug undermoon_builder_test bash
-	docker cp undermoon-builder-container-debug:/undermoon/target/debug/server_proxy ./examples/target_volume/debug/
-	docker cp undermoon-builder-container-debug:/undermoon/target/debug/coordinator ./examples/target_volume/debug/
-	docker cp undermoon-builder-container-debug:/undermoon/target/debug/mem_broker ./examples/target_volume/debug/
-	docker rm undermoon-builder-container-debug
 	docker image build -f examples/Dockerfile-undermoon-test -t undermoon_test .
 
 # The release builder will build the binaries and move it out by `docker cp`.
 # When the release undermoon image is built, the binaries will be moved into it.
 docker-build-release:
-	rm -f examples/target_volume/debug/*
-	rm -f examples/target_volume/release/*
-	docker image build -f examples/Dockerfile-builder-release -t undermoon_builder_release .
-	mkdir -p ./examples/target_volume/release
-	docker rm undermoon-builder-container || true
-	docker create -it --name undermoon-builder-container undermoon_builder_release bash
-	docker cp undermoon-builder-container:/undermoon/target/release/server_proxy ./examples/target_volume/release/
-	docker cp undermoon-builder-container:/undermoon/target/release/coordinator ./examples/target_volume/release/
-	docker cp undermoon-builder-container:/undermoon/target/release/mem_broker ./examples/target_volume/release/
-	docker rm undermoon-builder-container
 	docker image build -f examples/Dockerfile-undermoon-release -t undermoon .
 
 docker-mem-broker:
@@ -113,6 +80,6 @@ chaos-test:
 func-test:
 	python chaostest/random_test.py exit-on-error
 
-.PHONY: build test lint release server coord test_broker flame docker-build-image docker-multi-redis docker-multi-shard docker-failover docker-mem-broker \
+.PHONY: build test lint release server coord test_broker flame docker-multi-redis docker-multi-shard docker-failover docker-mem-broker \
     start-func-test start-chaos stop-chaos list-chaos-services chaos-test func-test
 
diff --git a/chaostest/USAGE.md b/chaostest/USAGE.md
@@ -19,12 +19,10 @@ python chaostest/render_compose.py mem_broker [enable_failure]
 
 Build `undermoon`:
 ```
-make docker-build-image
-```
-
-Or rebuild if the source codes are changed:
-```
-make docker-rebuild-bin
+make docker-build-release-image
+// or
+make docker-build-test-image
+docker tag undermoon_test undermoon
 ```
 
 Start Docker Swarm:

diff --git a/chaostest/test_stack_mem_broker.yml.j2 b/chaostest/test_stack_mem_broker.yml.j2
@@ -6,9 +6,7 @@ services:
       restart_policy:
         condition: any
         delay: 30s
-    volumes:
-    - ${PWD}/examples/target_volume:/undermoon/target
-    command: /undermoon/target/debug/mem_broker
+    command: mem_broker
     ports:
     - "{{ broker_port }}:{{ broker_port }}"
     environment:
@@ -27,9 +25,7 @@ coordinator{{ coordinator_id }}:
     restart_policy:
       condition: any
       delay: 30s
-  volumes:
-  - ${PWD}/examples/target_volume:/undermoon/target
-  command: /undermoon/target/debug/coordinator
+  command: coordinator
   environment:
   - RUST_LOG=undermoon=debug,coordinator=debug
   - RUST_BACKTRACE=full
@@ -60,9 +56,7 @@ server_proxy{{ proxy_port }}:
     restart_policy:
       condition: any
       delay: 30s
-  volumes:
-  - ${PWD}/examples/target_volume:/undermoon/target
-  command: /undermoon/target/debug/server_proxy
+  command: server_proxy
   ports:
   - "{{ proxy_port }}:{{ proxy_port }}"
   environment:

diff --git a/docs/docker_compose_example.md b/docs/docker_compose_example.md
@@ -15,7 +15,7 @@ $ make docker-mem-broker-example
 
 Or build it yourself and run the `undermoon` docker image:
 ```bash
-$ make docker-build-image
+$ make docker-build-test-image
 $ make docker-mem-broker
 ```
 

diff --git a/examples/Dockerfile-builder b/examples/Dockerfile-builder
diff --git a/examples/Dockerfile-builder-release b/examples/Dockerfile-builder-release
diff --git a/examples/Dockerfile-builder-test b/examples/Dockerfile-builder-test
diff --git a/examples/Dockerfile-undermoon b/examples/Dockerfile-undermoon
diff --git a/examples/Dockerfile-undermoon-release b/examples/Dockerfile-undermoon-release
@@ -1,7 +1,29 @@
-FROM rust:1.43-buster
+# Use https://crates.io/crates/cargo-chef to cache dependencies.
 
+FROM rust:1.49-buster as planner
 WORKDIR /undermoon
+RUN cargo install cargo-chef
+COPY src /undermoon/src
+COPY Cargo.toml Cargo.lock /undermoon/
+RUN cargo chef prepare  --recipe-path recipe.json
 
-COPY ./examples/target_volume/release/server_proxy /bin/
-COPY ./examples/target_volume/release/coordinator /bin/
-COPY ./examples/target_volume/release/mem_broker /bin/
+FROM rust:1.49-buster as cacher
+WORKDIR /undermoon
+RUN cargo install cargo-chef
+COPY --from=planner /undermoon/recipe.json recipe.json
+RUN cargo chef cook --release --recipe-path recipe.json
+
+FROM rust:1.49-buster as builder
+WORKDIR /undermoon
+COPY src /undermoon/src
+COPY Cargo.toml Cargo.lock /undermoon/
+# Copy over the cached dependencies
+COPY --from=cacher /undermoon/target target
+COPY --from=cacher $CARGO_HOME $CARGO_HOME
+RUN cargo build --release
+
+FROM debian:buster as undermoon
+WORKDIR /undermoon
+COPY --from=builder /undermoon/target/release/server_proxy /bin
+COPY --from=builder /undermoon/target/release/coordinator /bin
+COPY --from=builder /undermoon/target/release/mem_broker /bin
diff --git a/examples/Dockerfile-undermoon-test b/examples/Dockerfile-undermoon-test
@@ -1,7 +1,29 @@
-FROM rust:1.43-buster
+# Use https://crates.io/crates/cargo-chef to cache dependencies.
 
+FROM rust:1.49-buster as planner
 WORKDIR /undermoon
+RUN cargo install cargo-chef
+COPY src /undermoon/src
+COPY Cargo.toml Cargo.lock /undermoon/
+RUN cargo chef prepare  --recipe-path recipe.json
 
-COPY ./examples/target_volume/debug/server_proxy /bin/
-COPY ./examples/target_volume/debug/coordinator /bin/
-COPY ./examples/target_volume/debug/mem_broker /bin/
+FROM rust:1.49-buster as cacher
+WORKDIR /undermoon
+RUN cargo install cargo-chef
+COPY --from=planner /undermoon/recipe.json recipe.json
+RUN cargo chef cook --recipe-path recipe.json
+
+FROM rust:1.49-buster as builder
+WORKDIR /undermoon
+COPY src /undermoon/src
+COPY Cargo.toml Cargo.lock /undermoon/
+# Copy over the cached dependencies
+COPY --from=cacher /undermoon/target target
+COPY --from=cacher $CARGO_HOME $CARGO_HOME
+RUN cargo build
+
+FROM debian:buster as undermoon
+WORKDIR /undermoon
+COPY --from=builder /undermoon/target/debug/server_proxy /bin
+COPY --from=builder /undermoon/target/debug/coordinator /bin
+COPY --from=builder /undermoon/target/debug/mem_broker /bin
diff --git a/examples/copy_target.sh b/examples/copy_target.sh
diff --git a/examples/docker-compose-mem-broker-example.yml b/examples/docker-compose-mem-broker-example.yml
@@ -2,11 +2,10 @@ version: '3'
 services:
   server_proxy1:
     container_name: server_proxy1
-    image: "doyoubi/undermoon:0.3.0-buster"
+    image: "doyoubi/undermoon:0.4.1-buster"
     volumes:
     - ${PWD}/examples/mem-broker/server_proxy1.toml:/undermoon/config/server_proxy.toml
     - ${PWD}/examples/run_proxy.sh:/undermoon/run_proxy.sh
-    - ${PWD}/examples/target_volume:/undermoon/target
     command: bash /undermoon/run_proxy.sh
     ports:
     - "6001:6001"
@@ -18,11 +17,10 @@ services:
     - "redis2"
   server_proxy2:
     container_name: server_proxy2
-    image: "doyoubi/undermoon:0.3.0-buster"
+    image: "doyoubi/undermoon:0.4.1-buster"
     volumes:
     - ${PWD}/examples/mem-broker/server_proxy2.toml:/undermoon/config/server_proxy.toml
     - ${PWD}/examples/run_proxy.sh:/undermoon/run_proxy.sh
-    - ${PWD}/examples/target_volume:/undermoon/target
     command: bash /undermoon/run_proxy.sh
     ports:
     - "6002:6002"
@@ -34,11 +32,10 @@ services:
     - "redis4"
   server_proxy3:
     container_name: server_proxy3
-    image: "doyoubi/undermoon:0.3.0-buster"
+    image: "doyoubi/undermoon:0.4.1-buster"
     volumes:
     - ${PWD}/examples/mem-broker/server_proxy3.toml:/undermoon/config/server_proxy.toml
     - ${PWD}/examples/run_proxy.sh:/undermoon/run_proxy.sh
-    - ${PWD}/examples/target_volume:/undermoon/target
     command: bash /undermoon/run_proxy.sh
     ports:
     - "6003:6003"
@@ -51,11 +48,10 @@ services:
 
   server_proxy4:
     container_name: server_proxy4
-    image: "doyoubi/undermoon:0.3.0-buster"
+    image: "doyoubi/undermoon:0.4.1-buster"
     volumes:
       - ${PWD}/examples/mem-broker/server_proxy4.toml:/undermoon/config/server_proxy.toml
       - ${PWD}/examples/run_proxy.sh:/undermoon/run_proxy.sh
-      - ${PWD}/examples/target_volume:/undermoon/target
     command: bash /undermoon/run_proxy.sh
     ports:
       - "6004:6004"
@@ -67,11 +63,10 @@ services:
       - "redis8"
   server_proxy5:
     container_name: server_proxy5
-    image: "doyoubi/undermoon:0.3.0-buster"
+    image: "doyoubi/undermoon:0.4.1-buster"
     volumes:
       - ${PWD}/examples/mem-broker/server_proxy5.toml:/undermoon/config/server_proxy.toml
       - ${PWD}/examples/run_proxy.sh:/undermoon/run_proxy.sh
-      - ${PWD}/examples/target_volume:/undermoon/target
     command: bash /undermoon/run_proxy.sh
     ports:
       - "6005:6005"
@@ -83,11 +78,10 @@ services:
       - "redis10"
   server_proxy6:
     container_name: server_proxy6
-    image: "doyoubi/undermoon:0.3.0-buster"
+    image: "doyoubi/undermoon:0.4.1-buster"
     volumes:
       - ${PWD}/examples/mem-broker/server_proxy6.toml:/undermoon/config/server_proxy.toml
       - ${PWD}/examples/run_proxy.sh:/undermoon/run_proxy.sh
-      - ${PWD}/examples/target_volume:/undermoon/target
     command: bash /undermoon/run_proxy.sh
     ports:
       - "6006:6006"
@@ -100,11 +94,10 @@ services:
 
   coordinator1:
     container_name: coordinator1
-    image: "doyoubi/undermoon:0.3.0-buster"
+    image: "doyoubi/undermoon:0.4.1-buster"
     volumes:
     - ${PWD}/examples/mem-broker/coordinator1.toml:/undermoon/config/coordinator.toml
     - ${PWD}/examples/run_coordinator.sh:/undermoon/run_coordinator.sh
-    - ${PWD}/examples/target_volume:/undermoon/target
     command: bash /undermoon/run_coordinator.sh
     environment:
     - RUST_LOG=undermoon=debug,coordinator=debug
@@ -119,11 +112,10 @@ services:
     - "mem_broker"
   coordinator2:
     container_name: coordinator2
-    image: "doyoubi/undermoon:0.3.0-buster"
+    image: "doyoubi/undermoon:0.4.1-buster"
     volumes:
     - ${PWD}/examples/mem-broker/coordinator2.toml:/undermoon/config/coordinator.toml
     - ${PWD}/examples/run_coordinator.sh:/undermoon/run_coordinator.sh
-    - ${PWD}/examples/target_volume:/undermoon/target
     command: bash /undermoon/run_coordinator.sh
     environment:
     - RUST_LOG=undermoon=debug,coordinator=debug
@@ -139,11 +131,10 @@ services:
 
   mem_broker:
     container_name: mem_broker
-    image: "doyoubi/undermoon:0.3.0-buster"
+    image: "doyoubi/undermoon:0.4.1-buster"
     volumes:
       - ${PWD}/examples/mem-broker/mem-broker.toml:/undermoon/config/mem-broker.toml
       - ${PWD}/examples/run_broker.sh:/undermoon/run_broker.sh
-      - ${PWD}/examples/target_volume:/undermoon/target
     command: bash /undermoon/run_broker.sh
     environment:
       - RUST_LOG=undermoon=debug,mem_broker=debug