From: Matthew Newton <matthew-git@newtoncomputing.co.uk>
Date: Thu, 24 Jun 2021 15:13:28 +0000 (+0100)
Subject: docker: install some useful tools by default for debugging purposes
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d016094ed36f5956ae1c9a42c083074642108043;p=thirdparty%2Ffreeradius-server.git

docker: install some useful tools by default for debugging purposes
---

diff --git a/scripts/docker/build-centos7/Dockerfile.deps b/scripts/docker/build-centos7/Dockerfile.deps
index 18af0001aae..6e9b7dd79b9 100644
--- a/scripts/docker/build-centos7/Dockerfile.deps
+++ b/scripts/docker/build-centos7/Dockerfile.deps
@@ -16,7 +16,11 @@ RUN yum install -y \
 #  which is required by fixture setup utilities
     which \
 #  libnl3-devel is required for the EAP tests
-    libnl3-devel
+    libnl3-devel \
+#  For debugging (e.g. in crossbuild)
+    gdb \
+    less \
+    vim
 
 
 #
diff --git a/scripts/docker/build-debian10/Dockerfile.deps b/scripts/docker/build-debian10/Dockerfile.deps
index 531c410927b..e4635869fbd 100644
--- a/scripts/docker/build-debian10/Dockerfile.deps
+++ b/scripts/docker/build-debian10/Dockerfile.deps
@@ -25,6 +25,10 @@ RUN apt-get update && \
 #  eapol_test dependencies
         libnl-3-dev \
         libnl-genl-3-dev \
+#  For debugging (e.g. in crossbuild)
+        gdb \
+        less \
+        vim \
 #  Compilers
         clang \
         g++ \
diff --git a/scripts/docker/build-debian9/Dockerfile.deps b/scripts/docker/build-debian9/Dockerfile.deps
index 8da4df86784..6dd2281984f 100644
--- a/scripts/docker/build-debian9/Dockerfile.deps
+++ b/scripts/docker/build-debian9/Dockerfile.deps
@@ -26,6 +26,10 @@ RUN apt-get update && \
 #  eapol_test dependencies
         libnl-3-dev \
         libnl-genl-3-dev \
+#  For debugging (e.g. in crossbuild)
+        gdb \
+        less \
+        vim \
 #  Compilers
         g++ && \
     bash -c "$(wget -O - https://apt.llvm.org/llvm.sh)"
diff --git a/scripts/docker/build-debiansid/Dockerfile.deps b/scripts/docker/build-debiansid/Dockerfile.deps
index 07c1355ab81..64d4ccc3fcb 100644
--- a/scripts/docker/build-debiansid/Dockerfile.deps
+++ b/scripts/docker/build-debiansid/Dockerfile.deps
@@ -25,6 +25,10 @@ RUN apt-get update && \
 #  eapol_test dependencies
         libnl-3-dev \
         libnl-genl-3-dev \
+#  For debugging (e.g. in crossbuild)
+        gdb \
+        less \
+        vim \
 #  Compilers
         clang \
         g++ \
diff --git a/scripts/docker/build-ubuntu18/Dockerfile.deps b/scripts/docker/build-ubuntu18/Dockerfile.deps
index 944d1485516..688c1f92956 100644
--- a/scripts/docker/build-ubuntu18/Dockerfile.deps
+++ b/scripts/docker/build-ubuntu18/Dockerfile.deps
@@ -25,6 +25,10 @@ RUN apt-get update && \
 #  eapol_test dependencies
         libnl-3-dev \
         libnl-genl-3-dev \
+#  For debugging (e.g. in crossbuild)
+        gdb \
+        less \
+        vim \
 #  Compilers
         clang \
         g++ \
diff --git a/scripts/docker/build-ubuntu20/Dockerfile.deps b/scripts/docker/build-ubuntu20/Dockerfile.deps
index 792b87b62ac..cc34830d9ba 100644
--- a/scripts/docker/build-ubuntu20/Dockerfile.deps
+++ b/scripts/docker/build-ubuntu20/Dockerfile.deps
@@ -25,6 +25,10 @@ RUN apt-get update && \
 #  eapol_test dependencies
         libnl-3-dev \
         libnl-genl-3-dev \
+#  For debugging (e.g. in crossbuild)
+        gdb \
+        less \
+        vim \
 #  Compilers
         clang \
         g++ \