chore: fix deploy docker ci

loco-rs · Jan 23, 2025 · f54a7b0 · f54a7b0
1 parent 0897e27
commit f54a7b0
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/.github/workflows/loco-gen-deploy.yml b/.github/workflows/loco-gen-deploy.yml
@@ -9,6 +9,7 @@ on:
 env:
   RUST_TOOLCHAIN: stable
   TOOLCHAIN_PROFILE: minimal
+  LOCO_DEV_MODE_PATH: ${{ github.workspace }}
 
 jobs:
   g-deploy-docker:
@@ -37,13 +38,15 @@ jobs:
         run: |
           loco new -n myapp --db sqlite --bg async --assets serverside -a
         working-directory: /tmp
-        env:
-          LOCO_DEV_MODE_PATH: loco
+
+      - name: generate deployment
+        run: cargo loco generate deployment --kind docker
+        working-directory: /tmp/myapp
 
       - name: copy local loco dependency
         run: |
           cp -r ${{github.workspace}} /tmp/myapp/loco
 
-      - name: generate deployment
-        run: cargo loco generate deployment --kind docker && docker build -t demo .
+      - name: build deployment
+        run: docker build -t demo .
         working-directory: /tmp/myapp
diff --git a/loco-gen/src/lib.rs b/loco-gen/src/lib.rs
@@ -273,10 +273,12 @@ pub fn generate(rrgen: &RRgen, component: Component, appinfo: &AppInfo) -> Resul
             port,
         } => match kind {
             DeploymentKind::Docker => {
+                let loco_dev_mode_path = std::env::var("LOCO_DEV_MODE_PATH");
                 let vars = json!({
                     "pkg_name": appinfo.app_name,
                     "copy_asset_folder": asset_folder.unwrap_or_default(),
-                    "fallback_file": fallback_file.unwrap_or_default()
+                    "fallback_file": fallback_file.unwrap_or_default(),
+                    "loco_dev_mode_path": loco_dev_mode_path.unwrap_or_default()
                 });
                 render_template(rrgen, Path::new("deployment/docker"), &vars)?
             }

diff --git a/loco-gen/src/templates/deployment/docker/docker.t b/loco-gen/src/templates/deployment/docker/docker.t
@@ -7,7 +7,10 @@ FROM rust:1.83.0-slim as builder
 WORKDIR /usr/src/
 
 COPY . .
-
+{% if loco_dev_mode_path -%}
+#  The `loco` root folder should be moved to this dockerfile path so the context can copy it to the image
+RUN mkdir -p {{loco_dev_mode_path}} && mv loco/* {{loco_dev_mode_path}}
+{% endif -%}
 RUN cargo build --release
 
 FROM debian:bookworm-slim