Skip to content

Commit

Permalink
move holo-cli to an external repository
Browse files Browse the repository at this point in the history
Signed-off-by: Fréderic LOUI <[email protected]>
  • Loading branch information
frederic-loui committed Apr 9, 2024
1 parent a8cd5d4 commit 8d360eb
Show file tree
Hide file tree
Showing 17 changed files with 12 additions and 2,238 deletions.
3 changes: 1 addition & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
members = [
"holo-bfd",
"holo-bgp",
"holo-cli",
"holo-daemon",
"holo-interface",
"holo-keychain",
Expand All @@ -17,7 +16,7 @@ members = [
"holo-utils",
"holo-yang",
]
default-members = ["holo-daemon", "holo-cli"]
default-members = ["holo-daemon"]
resolver = "2"

[workspace.package]
Expand Down
12 changes: 11 additions & 1 deletion docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,20 @@ 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

# Final base
# ==============================================================================

Expand All @@ -35,7 +45,7 @@ RUN echo "alias ipr='ip -4 ro ; ip -6 ro ; ip -M ro'" >> /root/.bashrc

COPY --from=build /usr/src/holo/holo-daemon/holod.toml /etc/holod.toml
COPY --from=build /usr/src/holo/target/release/holod /usr/local/sbin/
COPY --from=build /usr/src/holo/target/release/holo-cli /usr/local/sbin/
COPY --from=build /usr/src/holo-cli/target/release/holo-cli /usr/local/sbin/

ENV RUST_BACKTRACE=1
ENV RUST_LOG=holo=debug
Expand Down
31 changes: 0 additions & 31 deletions holo-cli/Cargo.toml

This file was deleted.

19 changes: 0 additions & 19 deletions holo-cli/LICENSE

This file was deleted.

6 changes: 0 additions & 6 deletions holo-cli/build.rs

This file was deleted.

200 changes: 0 additions & 200 deletions holo-cli/src/client/grpc.rs

This file was deleted.

45 changes: 0 additions & 45 deletions holo-cli/src/client/mod.rs

This file was deleted.

Loading

0 comments on commit 8d360eb

Please sign in to comment.