From bbf68b1af7d77503c06cf312184794e3a9ab1155 Mon Sep 17 00:00:00 2001
From: guillaumemichel <guillaume@michel.id>
Date: Wed, 25 Sep 2024 11:51:14 +0200
Subject: [PATCH] removing dependency on libp2p-lookup

---
 misc/server/CHANGELOG.md | 30 ++++++++++++++++++++++++++++++
 misc/server/Cargo.toml   | 20 ++++++++++++++++++--
 misc/server/Dockerfile   |  2 --
 misc/server/README.md    |  7 -------
 4 files changed, 48 insertions(+), 11 deletions(-)

diff --git a/misc/server/CHANGELOG.md b/misc/server/CHANGELOG.md
index 5369163460c..9f2d94ee5db 100644
--- a/misc/server/CHANGELOG.md
+++ b/misc/server/CHANGELOG.md
@@ -1,3 +1,10 @@
+## 0.12.8
+
+### Changed
+
+- Remove deprecated [`libp2p-lookup`](https://github.com/mxinden/libp2p-lookup) from Dockerfile.
+  See PR XXXX
+
 ## 0.12.7
 
 ### Changed
@@ -31,6 +38,7 @@
 ## 0.12.3
 
 ### Changed
+
 - Add libp2p-lookup to Dockerfile to enable healthchecks.
 
 ### Fixed
@@ -42,14 +50,18 @@
 [PR 4467]: https://github.com/libp2p/rust-libp2p/pull/4467
 
 ## 0.12.2
+
 ### Fixed
+
 - Adhere to `--metrics-path` flag and listen on `0.0.0.0:8888` (default IPFS metrics port).
   [PR 4392]
 
 [PR 4392]: https://github.com/libp2p/rust-libp2p/pull/4392
 
 ## 0.12.1
+
 ### Changed
+
 - Move to tokio and hyper.
   See [PR 4311].
 - Move to distroless Docker base image.
@@ -58,39 +70,57 @@
 [PR 4311]: https://github.com/libp2p/rust-libp2p/pull/4311
 
 ## 0.8.0
+
 ### Changed
+
 - Remove mplex support.
 
 ## 0.7.0
+
 ### Changed
+
 - Update to libp2p v0.47.0.
 
 ## 0.6.0 - 2022-05-05
+
 ### Changed
+
 - Update to libp2p v0.44.0.
 
 ## 0.5.4 - 2022-01-11
+
 ### Changed
+
 - Pull latest autonat changes.
 
 ## 0.5.3 - 2021-12-25
+
 ### Changed
+
 - Update dependencies.
 - Pull in autonat fixes.
 
 ## 0.5.2 - 2021-12-20
+
 ### Added
+
 - Add support for libp2p autonat protocol via `--enable-autonat`.
 
 ## 0.5.1 - 2021-12-20
+
 ### Fixed
+
 - Update dependencies.
 - Fix typo in command line flag `--enable-kademlia`.
 
 ## 0.5.0 - 2021-11-18
+
 ### Changed
+
 - Disable Kademlia protocol by default.
 
 ## 0.4.0 - 2021-11-18
+
 ### Fixed
+
 - Update dependencies.
diff --git a/misc/server/Cargo.toml b/misc/server/Cargo.toml
index 798ecfa07a9..0954e2f38d8 100644
--- a/misc/server/Cargo.toml
+++ b/misc/server/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "libp2p-server"
-version = "0.12.7"
+version = "0.12.8"
 authors = ["Max Inden <mail@max-inden.de>"]
 edition = "2021"
 repository = "https://github.com/libp2p/rust-libp2p"
@@ -16,7 +16,23 @@ clap = { version = "4.5.6", features = ["derive"] }
 futures = { workspace = true }
 futures-timer = "3"
 axum = "0.7"
-libp2p = { workspace = true, features = ["autonat", "dns", "tokio", "noise", "tcp", "yamux", "identify", "kad", "ping", "relay", "metrics", "rsa", "macros", "quic", "websocket"] }
+libp2p = { workspace = true, features = [
+    "autonat",
+    "dns",
+    "tokio",
+    "noise",
+    "tcp",
+    "yamux",
+    "identify",
+    "kad",
+    "ping",
+    "relay",
+    "metrics",
+    "rsa",
+    "macros",
+    "quic",
+    "websocket",
+] }
 prometheus-client = { workspace = true }
 serde = "1.0.203"
 serde_derive = "1.0.125"
diff --git a/misc/server/Dockerfile b/misc/server/Dockerfile
index 24ae2b9fd99..12a8982eb3f 100644
--- a/misc/server/Dockerfile
+++ b/misc/server/Dockerfile
@@ -1,7 +1,6 @@
 # syntax=docker/dockerfile:1.5-labs
 FROM rust:1.81.0 as chef
 RUN wget -q -O- https://github.com/LukeMathWalker/cargo-chef/releases/download/v0.1.62/cargo-chef-x86_64-unknown-linux-gnu.tar.gz | tar -zx -C /usr/local/bin
-RUN cargo install --locked --root /usr/local libp2p-lookup --version 0.6.4
 WORKDIR /app
 
 FROM chef AS planner
@@ -17,5 +16,4 @@ COPY . .
 RUN cargo build --release --package libp2p-server
 
 FROM gcr.io/distroless/cc
-COPY --from=builder /usr/local/bin/libp2p-server /usr/local/bin/libp2p-lookup /usr/local/bin/
 CMD ["libp2p-server"]
diff --git a/misc/server/README.md b/misc/server/README.md
index 0da1bd8abd9..f9a5d65124a 100644
--- a/misc/server/README.md
+++ b/misc/server/README.md
@@ -25,7 +25,6 @@ Options:
   -h, --help                         Print help
 ```
 
-
 ```
 cargo run -- --config ~/.ipfs/config
 
@@ -33,9 +32,3 @@ Local peer id: PeerId("12D3KooWSa1YEeQVSwvoqAMhwjKQ6kqZQckhWPb3RWEGV3sZGU6Z")
 Listening on "/ip4/127.0.0.1/udp/4001/quic"
 [...]
 ```
-
-The Docker container includes [libp2-lookup](https://github.com/mxinden/libp2p-lookup/) to enable adding a proper healthcheck for container startup, e.g.
-
-``` shell
-docker run --health-cmd 'libp2p-lookup direct --address /ip4/127.0.0.1/tcp/4001/p2p/QmQCU2EcMqAqQPR2i9bChDtGNJchTbq5TbXJJ16u19uLTa' /home/ipfs/.ipfs:/ipfs ghcr.io/libp2p/rust-libp2p-server --config /ipfs/config
-```