From cbbc2e373121f5168a7db1bf11ab7a4e7e8f2c6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9deric=20LOUI?= <frederic.loui@renater.fr>
Date: Tue, 9 Apr 2024 11:10:06 +0200
Subject: [PATCH] Dockerfile adjustment for containelab image and ensure that
 it includes holo-cli from external repository

---
 Cargo.toml        | 2 --
 docker/Dockerfile | 6 ++++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 396c9e04..3263092b 100644
--- 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
index 85d56a67..82baa03f 100644
--- 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