Address feedback, fix local run, separate final steps per crate

Author: jonaro00

.gitignore

@@ -5,6 +5,8 @@
 **/target/
 # Ignore the cargo lockfiles not in the workspace root
 */**/Cargo.lock
+# cargo-chef testing
+recipe.json
 
 # These are backup files generated by rustfmt
 **/*.rs.bk

Containerfile

@@ -50,23 +50,45 @@ RUN cargo build \
     --bin shuttle-next -F next
 
 
-# The final image for running each "shuttle-..." binary
+# Base image for running each "shuttle-..." binary
 ARG RUSTUP_TOOLCHAIN
-FROM docker.io/library/rust:${RUSTUP_TOOLCHAIN}-buster as shuttle-crate
+FROM docker.io/library/rust:${RUSTUP_TOOLCHAIN}-buster as shuttle-crate-base
 ARG CARGO_PROFILE
 ARG folder
 ARG crate
 ARG prepare_args
-# used as env variable in prepare script
+# Fixes some dependencies compiled with incompatible versions of rustc
+ENV RUSTUP_TOOLCHAIN=${RUSTUP_TOOLCHAIN}
+# Used as env variable in prepare script
 ARG PROD
 
-# Individual preparation of images
-COPY ${folder}/prepare.sh /prepare.sh
-RUN /prepare.sh "${prepare_args}"
-
-# shuttle-next is only needed in deployer but is now installed in all images.
-# can be improved, but does not hurt much.
-COPY --from=builder /build/target/${CARGO_PROFILE}/shuttle-next /usr/local/cargo/bin/
+# Some crates need additional libs
+COPY ${folder}/*.so /usr/lib/
+ENV LD_LIBRARY_PATH=/usr/lib/
 
 COPY --from=builder /build/target/${CARGO_PROFILE}/${crate} /usr/local/bin/service
 ENTRYPOINT ["/usr/local/bin/service"]
+
+
+# Targets for each crate
+
+FROM shuttle-crate-base AS shuttle-auth
+FROM shuttle-auth AS shuttle-auth-dev
+
+FROM shuttle-crate-base AS shuttle-deployer
+    ARG CARGO_PROFILE
+    COPY --from=builder /build/target/${CARGO_PROFILE}/shuttle-next /usr/local/cargo/bin/
+    COPY deployer/prepare.sh /prepare.sh
+    RUN /prepare.sh "${prepare_args}"
+FROM shuttle-deployer AS shuttle-deployer-dev
+    # Source code needed for compiling with [patch.crates-io]
+    COPY --from=planner /build /usr/src/shuttle/
+
+FROM shuttle-crate-base AS shuttle-gateway
+FROM shuttle-gateway AS shuttle-gateway-dev
+
+FROM shuttle-crate-base AS shuttle-provisioner
+FROM shuttle-provisioner AS shuttle-provisioner-dev
+
+FROM shuttle-crate-base AS shuttle-resource-recorder
+FROM shuttle-resource-recorder AS shuttle-resource-recorder-dev

Makefile

@@ -28,7 +28,6 @@ PROVISIONER_TAG?=$(TAG)
 RESOURCE_RECORDER_TAG?=$(TAG)
 
 DOCKER_BUILD?=docker buildx build
-
 ifeq ($(CI),true)
 DOCKER_BUILD+= --progress plain
 endif
@@ -67,6 +66,7 @@ USE_TLS?=disable
 # default for local run
 CARGO_PROFILE?=debug
 RUST_LOG?=shuttle=debug,info
+DEV_SUFFIX=-dev
 DEPLOYS_API_KEY?=gateway4deployes
 endif
 
@@ -179,6 +179,7 @@ down: $(DOCKER_COMPOSE_FILES)
 
 shuttle-%:
 	$(DOCKER_BUILD) \
+		--target $(@)$(DEV_SUFFIX) \
 		--build-arg folder=$(*) \
 		--build-arg crate=$(@) \
 		--build-arg prepare_args=$(PREPARE_ARGS) \

auth/prepare.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 ###############################################################################
 # This file is used by our common Containerfile incase the container for this #

deployer/prepare.sh

@@ -77,7 +77,6 @@ services:
       - ${DOCKER_SOCK}:/var/run/docker.sock
     environment:
       - RUST_LOG=${RUST_LOG}
-      - LD_LIBRARY_PATH=/usr/src/shuttle/gateway
     command:
       - "--state=/var/lib/shuttle"
       - "start"

docker-compose.yml

@@ -750,8 +750,7 @@ impl ProjectCreating {
                         self.project_id.to_string()
                     ],
                     "Env": [
-                        "RUST_LOG=debug,shuttle=trace,h2=warn",
-                        "LD_LIBRARY_PATH=/usr/src/shuttle/deployer"
+                        "RUST_LOG=debug,shuttle=trace,h2=warn"
                     ]
                 })
             });