fix: install shuttle-next runtime in deployers (#1127)

* fix: install shuttle-next runtime in deployers

* fix: revert previous, fix registry bug

* refactor: comment, newline

* fix: add panax mirror after installing shuttle-next

* refactor: clarify comment in containerfile

Containerfile

@@ -57,7 +57,8 @@ RUN /prepare.sh "${prepare_args}"
 
 COPY --from=cache /build /usr/src/shuttle/
 
-# Any prepare steps that depend on the COPY from src cache
+# Any prepare steps that depend on the COPY from src cache.
+# In the deployer shuttle-next is installed and the panamax mirror config is added in this step.
 RUN /prepare.sh --after-src "${prepare_args}"
 
 COPY --from=builder /build/target/${CARGO_PROFILE}/shuttle-${folder} /usr/local/bin/service

deployer/prepare.sh

@@ -5,17 +5,28 @@
 # service might need some extra preparation steps for its final image         #
 ###############################################################################
 
-
 # Stuff that depends on local source files
 if [ "$1" = "--after-src" ]; then
+    # Install the shuttle-next runtime for shuttle-next services.
+    cargo install shuttle-runtime --path "/usr/src/shuttle/runtime" --bin shuttle-next --features next || exit 1
 
-    # Install the shuttle runtime
-    cargo install shuttle-runtime --path "/usr/src/shuttle/runtime" --bin shuttle-next --features next
-
+    while getopts "p," o; do
+    case $o in
+        "p") # if panamax is used, the '-p' parameter is passed
+            # Make future crates requests to our own mirror
+            echo '
+[source.shuttle-crates-io-mirror]
+registry = "sparse+http://panamax:8080/index/"
+[source.crates-io]
+replace-with = "shuttle-crates-io-mirror"' >> $CARGO_HOME/config.toml
+                ;;
+            *)
+                ;;
+        esac
+    done
     exit 0
 fi
 
-
 # Patch crates to be on same versions
 mkdir -p $CARGO_HOME
 touch $CARGO_HOME/config.toml
@@ -49,21 +60,6 @@ fi
 # Add the wasm32-wasi target
 rustup target add wasm32-wasi
 
-while getopts "p," o; do
-    case $o in
-        "p") # if panamax is used, the '-p' parameter is passed
-            # Make future crates requests to our own mirror
-            echo '
-[source.shuttle-crates-io-mirror]
-registry = "sparse+http://panamax:8080/index/"
-[source.crates-io]
-replace-with = "shuttle-crates-io-mirror"' >> $CARGO_HOME/config.toml
-            ;;
-        *)
-            ;;
-    esac
-done
-
 # Install common build tools for external crates
 # The image should already have these: https://github.com/docker-library/buildpack-deps/blob/65d69325ad741cea6dee20781c1faaab2e003d87/debian/buster/Dockerfile
 apt update