docker: prefer CMD to ENTRYPOINT

Specifying watchfrr as CMD instead of ENTRYPOINT allows one to easily
override this command when starting a docker container. This allows
simple, manual testing via (e.g.) bash. With ENTRYPOINT only the
container will simply explode with an exit code if watchfrr exits.

For instance one could start a shell session in this container via:

```
docker run --name test --rm -i -t <frr-container> bash
```

The default behavior (`docker run <frr-container>` with no command
specified) is not changed.

Signed-off-by: Wesley Coakley <wcoakley@nvidia.com>

diff --git a/docker/alpine/Dockerfile b/docker/alpine/Dockerfile
index 126710f8c267464fef3a6c61df4de518f601b052..69aa9c38a63a7a49ce99224885e8c4c1f53c10e0 100644 (file)
--- a/docker/alpine/Dockerfile
+++ b/docker/alpine/Dockerfile
@@ -56,4 +56,4 @@ RUN apk add \
                --allow-untrusted /pkgs/apk/*/*.apk \
        && rm -rf /pkgs
 COPY docker/alpine/docker-start /usr/lib/frr/docker-start
-ENTRYPOINT [ "/sbin/tini", "--", "/usr/lib/frr/docker-start" ]
+CMD [ "/sbin/tini", "--", "/usr/lib/frr/docker-start" ]

diff --git a/docker/centos-7/Dockerfile b/docker/centos-7/Dockerfile
index a92326fcf3b35ec898a42b241bb754e66e25e574..d2ec9f974b858d7806ae1d8d484a8e9a3a0d29e2 100644 (file)
--- a/docker/centos-7/Dockerfile
+++ b/docker/centos-7/Dockerfile
@@ -40,4 +40,4 @@ COPY --from=centos-7-builder /rpmbuild/RPMS/ /pkgs/rpm/
 RUN yum install -y /pkgs/rpm/*/*.rpm \
     && rm -rf /pkgs
 COPY docker/centos-7/docker-start /usr/lib/frr/docker-start
-ENTRYPOINT [ "/usr/lib/frr/docker-start" ]
+CMD [ "/usr/lib/frr/docker-start" ]

diff --git a/docker/centos-8/Dockerfile b/docker/centos-8/Dockerfile
index 7ed7948927a8f458459b81516a8cf20451cdfbb3..104501aabc30f04ea2e4f9d948d2e6739f5860df 100644 (file)
--- a/docker/centos-8/Dockerfile
+++ b/docker/centos-8/Dockerfile
@@ -41,4 +41,4 @@ COPY --from=centos-8-builder /rpmbuild/RPMS/ /pkgs/rpm/
 RUN yum install -y /pkgs/rpm/*/*.rpm \
     && rm -rf /pkgs
 COPY docker/centos-8/docker-start /usr/lib/frr/docker-start
-ENTRYPOINT [ "/usr/lib/frr/docker-start" ]
+CMD [ "/usr/lib/frr/docker-start" ]

diff --git a/docker/debian/Dockerfile b/docker/debian/Dockerfile
index 3f830348bcaf3390e8f7ddaaeb9d1b7d36bb12a1..cc9217f10342a376a3040e33752652b4d1a705f4 100644 (file)
--- a/docker/debian/Dockerfile
+++ b/docker/debian/Dockerfile
@@ -17,4 +17,4 @@ RUN apt-get update && \
     rm -rf /var/lib/apt/lists/*
 
 ADD docker-start /usr/sbin/docker-start
-ENTRYPOINT ["/usr/sbin/docker-start"]
+CMD ["/usr/sbin/docker-start"]

diff --git a/docker/debian/docker-start b/docker/debian/docker-start
index 43854ab1429f75a1e0329ef75d3e0bd559996fac..a0f31f5ac52217fd4ae5ca6524b497f3b8c8ca0c 100755 (executable)
--- a/docker/debian/docker-start
+++ b/docker/debian/docker-start
@@ -7,4 +7,6 @@ set -e
 ##
 chown -R frr:frr /etc/frr
 /etc/init.d/frr start
-exec sleep 10000d
+
+# Sleep forever
+exec tail -f /dev/null

diff --git a/docker/ubuntu18-ci/Dockerfile b/docker/ubuntu18-ci/Dockerfile
index ac745c60a85b3934649ebad6d8c6dbd9ec6ca2e8..f6fa9103811e6ec4ab65de7b92706796a3ca8ffb 100644 (file)
--- a/docker/ubuntu18-ci/Dockerfile
+++ b/docker/ubuntu18-ci/Dockerfile
@@ -68,4 +68,4 @@ RUN cd ~/frr && \
 RUN cd ~/frr && make check || true
 
 COPY docker/ubuntu18-ci/docker-start /usr/sbin/docker-start
-ENTRYPOINT ["/usr/sbin/docker-start"]
+CMD ["/usr/sbin/docker-start"]

diff --git a/docker/ubuntu20-ci/Dockerfile b/docker/ubuntu20-ci/Dockerfile
index 56657789ee9cea39fd028b410c5f1f443a7732b8..0b08c2f278f84a702190e6497155b57be347a5e6 100644 (file)
--- a/docker/ubuntu20-ci/Dockerfile
+++ b/docker/ubuntu20-ci/Dockerfile
@@ -71,4 +71,4 @@ RUN cd ~/frr && \
 RUN cd ~/frr && make check || true
 
 COPY docker/ubuntu20-ci/docker-start /usr/sbin/docker-start
-ENTRYPOINT ["/usr/sbin/docker-start"]
+CMD ["/usr/sbin/docker-start"]