Dockerfile adjustment for containelab image and ensure that it includ…

…es holo-cli from external repository
holo-routing · Apr 9, 2024 · cbbc2e3 · cbbc2e3
1 parent 8015103
commit cbbc2e3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -73,8 +73,6 @@ tracing = "0.1"
 tracing-subscriber = { version = "0.3", features = ["env-filter", "json"] }
 yang2 = { version = "0.9", features = ["bundled"] }
 
-holo-cli = { path = "../holo-cli" }
-
 [workspace.lints.rust]
 rust_2018_idioms = "warn"
 unsafe_code = "forbid"

diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -9,10 +9,16 @@ RUN apt-get update && \
     libpcre2-dev \
     protobuf-compiler
 
+# holo
+# ==============================================================================
+
 WORKDIR /usr/src/holo
 COPY . .
 RUN cargo build --release
 
+# holo-cli (order is important as holo-cli is using protobuf file in holo)
+# ==============================================================================
+
 RUN git clone https://github.com/holo-routing/holo-cli.git /usr/src/holo-cli
 WORKDIR /usr/src/holo-cli
 RUN cargo build --release