commit 48108e0a0d66788531a124278259b28d6f2f48b4
author Davide Pesavento <davidepesa@gmail.com> Mon May 13 19:04:25 2024 -0400
committer Davide Pesavento <davidepesa@gmail.com> Mon May 13 19:04:25 2024 -0400
tree 293721c2814c20a65031766a5d6a929a962aaffe
parent f568c5ec7ab174bf3c30660a23fdc9a86fad5884

nfd-status-http-server: change default port to 6380

Change-Id: Ibccd79d04da346443ad17db9220940c488bc9873

Dockerfile

diff --git a/Dockerfile b/Dockerfile
index 17a0a75..b8fa4e5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,24 +10,24 @@
 ARG JOBS
 ARG SOURCE_DATE_EPOCH
 RUN --mount=rw,target=/src <<EOF
-set -eux
-cd /src
-./waf configure \
-    --prefix=/usr \
-    --libdir=/usr/lib \
-    --sysconfdir=/etc \
-    --localstatedir=/var \
-    --sharedstatedir=/var \
-    --without-systemd
-./waf build
-./waf install
-mkdir -p /deps/debian
-touch /deps/debian/control
-cd /deps
-for binary in nfd nfdc nfd-autoreg; do
-    dpkg-shlibdeps --ignore-missing-info "/usr/bin/${binary}" -O \
-        | sed -n 's|^shlibs:Depends=||p' | sed 's| ([^)]*),\?||g' > "${binary}"
-done
+    set -eux
+    cd /src
+    ./waf configure \
+        --prefix=/usr \
+        --libdir=/usr/lib \
+        --sysconfdir=/etc \
+        --localstatedir=/var \
+        --sharedstatedir=/var \
+        --without-systemd
+    ./waf build
+    ./waf install
+    mkdir -p /deps/debian
+    touch /deps/debian/control
+    cd /deps
+    for binary in nfd nfdc; do
+        dpkg-shlibdeps --ignore-missing-info "/usr/bin/${binary}" -O \
+            | sed -n 's|^shlibs:Depends=||p' | sed 's| ([^)]*),\?||g' > "${binary}"
+    done
 EOF
 
 
@@ -35,10 +35,6 @@
 
 COPY --link --from=build /usr/bin/nfd-autoreg /usr/bin/
 
-RUN --mount=from=build,source=/deps,target=/deps \
-    apt-get install -Uy --no-install-recommends $(cat /deps/nfd-autoreg) \
-    && apt-get distclean
-
 ENV HOME=/config
 VOLUME /config
 VOLUME /run/nfd
@@ -53,7 +49,8 @@
 COPY --link --from=build /usr/share/ndn/ /usr/share/ndn/
 
 RUN --mount=from=build,source=/deps,target=/deps \
-    apt-get install -Uy --no-install-recommends $(cat /deps/nfdc) \
+    apt-get install -Uy --no-install-recommends \
+        $(cat /deps/nfdc) \
         python3 \
     && apt-get distclean
 
@@ -61,7 +58,7 @@
 VOLUME /config
 VOLUME /run/nfd
 
-EXPOSE 8080/tcp
+EXPOSE 6380/tcp
 
 ENTRYPOINT ["/usr/bin/nfd-status-http-server", "--address", "0.0.0.0"]
 
@@ -73,7 +70,8 @@
 COPY --link --from=build /etc/ndn/nfd.conf.sample /config/nfd.conf
 
 RUN --mount=from=build,source=/deps,target=/deps \
-    apt-get install -Uy --no-install-recommends $(cat /deps/nfd /deps/nfdc) \
+    apt-get install -Uy --no-install-recommends \
+        $(cat /deps/nfd /deps/nfdc) \
     && apt-get distclean
 
 ENV HOME=/config