Delete the previously generated binary before rebuilding

codetalkio · Nov 12, 2023 · 14485a2 · 14485a2
1 parent 88159e2
commit 14485a2
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 4 deletions.
diff --git a/lambda-directly-optimized/Dockerfile-arm b/lambda-directly-optimized/Dockerfile-arm
@@ -44,4 +44,8 @@ COPY src/main.rs /dist/apollo-router-lambda/src/main.rs
 
 # Build our lambda bootstrap binary. The release artifact can be found at:
 # /dist/apollo-router-lambda/target/lambda/apollo-router-lambda/bootstrap
-RUN export PATH="$HOME/.cargo/bin:$PATH"; export RUSTFLAGS="-Zlocation-detail=none -Zthreads=8"; cargo lambda build --compiler cargo -Z build-std=std --target $TARGET --release
+RUN export PATH="$HOME/.cargo/bin:$PATH"; \
+    export RUSTFLAGS="-Zlocation-detail=none -Zthreads=8"; \
+    # Delete the previously generated main.rs artifacts.
+    rm -r target/$TARGET/release/deps/apollo_router_lambda*; \
+    cargo lambda build --compiler cargo -Z build-std=std --target $TARGET --release
diff --git a/lambda-directly-optimized/Dockerfile-arm-graviton b/lambda-directly-optimized/Dockerfile-arm-graviton
@@ -54,4 +54,8 @@ COPY src/main.rs /dist/apollo-router-lambda/src/main.rs
 # /dist/apollo-router-lambda/target/lambda/apollo-router-lambda/bootstrap
 # NOTE: We add additional ARM/Graviton2 specific flags to the build process. See more at
 # https://github.com/aws/aws-graviton-getting-started/blob/main/rust.md.
-RUN export PATH="$HOME/.cargo/bin:$PATH"; export RUSTFLAGS="-Ctarget-feature=+lse -Ctarget-cpu=neoverse-n1 -Zlocation-detail=none -Zthreads=8"; cat src/main.rs; cargo lambda build --compiler cargo -Z build-std=std --target $TARGET --release
+RUN export PATH="$HOME/.cargo/bin:$PATH"; \
+    export RUSTFLAGS="-Ctarget-feature=+lse -Ctarget-cpu=neoverse-n1 -Zlocation-detail=none -Zthreads=8"; \
+    # Delete the previously generated main.rs artifacts.
+    rm -r target/$TARGET/release/deps/apollo_router_lambda*; \
+    cargo lambda build --compiler cargo -Z build-std=std --target $TARGET --release
diff --git a/lambda-directly-optimized/Dockerfile-x86 b/lambda-directly-optimized/Dockerfile-x86
@@ -54,4 +54,6 @@ COPY src/main.rs /dist/apollo-router-lambda/src/main.rs
 # /dist/apollo-router-lambda/target/lambda/apollo-router-lambda/bootstrap
 RUN export PATH="$HOME/.cargo/bin:$PATH"; \
   export RUSTFLAGS="-Zlocation-detail=none -Zthreads=8"; \
+  # Delete the previously generated main.rs artifacts.
+  rm -r target/$TARGET/release/deps/apollo_router_lambda*; \
   cargo lambda build --compiler cargo -Z build-std=std --target $TARGET --release
diff --git a/lambda-directly/Dockerfile b/lambda-directly/Dockerfile
@@ -48,4 +48,7 @@ COPY src/main.rs /dist/apollo-router-lambda/src/main.rs
 
 # Build our lambda bootstrap binary. The release artifact can be found at:
 # /dist/apollo-router-lambda/target/lambda/apollo-router-lambda/bootstrap
-RUN export PATH="$HOME/.cargo/bin:$PATH"; cargo lambda build --compiler cargo --release
+RUN export PATH="$HOME/.cargo/bin:$PATH"; \
+    # Delete the previously generated main.rs artifacts.
+    rm -r target/x86_64-unknown-linux-gnu/release/deps/apollo_router_lambda*; \
+    cargo lambda build --compiler cargo --release
diff --git a/lambda-with-server/Dockerfile b/lambda-with-server/Dockerfile
@@ -48,4 +48,7 @@ COPY src/main.rs /dist/apollo-router-lambda/src/main.rs
 
 # Build our lambda bootstrap binary. The release artifact can be found at:
 # /dist/apollo-router-lambda/target/lambda/apollo-router-lambda/bootstrap
-RUN export PATH="$HOME/.cargo/bin:$PATH"; cargo lambda build --compiler cargo --release
+RUN export PATH="$HOME/.cargo/bin:$PATH"; \
+    # Delete the previously generated main.rs artifacts.
+    rm -r target/x86_64-unknown-linux-gnu/release/deps/apollo_router_lambda*; \
+    cargo lambda build --compiler cargo --release