fix single function release build

roche-rs · Feb 2, 2021 · b6ca585 · b6ca585
1 parent 3f2a1b1
commit b6ca585
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 5 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "roche"
-version = "0.3.1"
+version = "0.3.2"
 authors = ["Anthony Whalley <anton@venshare.com>"]
 edition = "2018"
 description = "A cli to build serverless rust applications"

diff --git a/src/main.rs b/src/main.rs
@@ -52,7 +52,10 @@ pub fn generateimagetag(buildtype: String) -> Option<String> {
             let img = format!("{}/{}{}", l, buildtype, dir);
             Some(img)
         }
-        None => None,
+        None => {
+            let img = format!("{}{}", buildtype, dir);
+            Some(img)
+        }
     }
 }
 
@@ -508,7 +511,26 @@ fn main() -> Result<()> {
             let runtimeimage = build_matches
                 .value_of("runtimeimage")
                 .unwrap_or(runtime_image.as_str());
+
             let mut tmp_docker_file = str::replace(RELEASE_BUILD, "BASE_IMAGE", buildimage);
+
+            if Path::new("lib.rs").exists() {
+                tmp_docker_file = str::replace(
+                    tmp_docker_file.as_str(),
+                    "#LIB_RS",
+                    "COPY lib.rs /app-build/src",
+                );
+                tmp_docker_file = str::replace(
+                    tmp_docker_file.as_str(),
+                    "#TEST",
+                    "RUN cargo test --lib --release",
+                );
+            }
+            if Path::new(".env").exists() {
+                tmp_docker_file =
+                    str::replace(tmp_docker_file.as_str(), "#ENV", "COPY .env /app-build/src");
+            }
+
             tmp_docker_file = str::replace(tmp_docker_file.as_str(), "RUNTIME_IMAGE", runtimeimage);
 
             let process = match Command::new("docker")

diff --git a/src/template/Release.Dockerfile b/src/template/Release.Dockerfile
@@ -1,8 +1,9 @@
 FROM BASE_IMAGE as builder
 COPY functions.rs /app-build/src
-COPY lib.rs /app-build/src
-COPY .env /app-build/src
-RUN cargo build --release && cargo test --lib --release 
+#LIB_RS
+#ENV
+RUN cargo build --release 
+#TEST  
 FROM RUNTIME_IMAGE
 RUN addgroup -S rocheuser && adduser -S rocheuser -G rocheuser
 WORKDIR "/app"