tests/topotests: Change docker build context

In order to support automated builds, the build context needs to be
the repository root.

So adapt our dockerfile and buildscript for this. Also, add files which
should not be included into the build context in .dockerignore to limit
the size of the build context to something sensible.

Signed-off-by: Christian Franke <chris@opensourcerouting.org>

diff --git a/.dockerignore b/.dockerignore
index 6b8710a711f3b689885aa5c26c6c06bde348e82b..f2fc34583d3e482edd93929b2d7864e41fec56cd 100644 (file)
--- a/.dockerignore
+++ b/.dockerignore
@@ -1 +1,7 @@
 .git
+**/*.a
+**/*.o
+**/*.la
+**/*.lo
+**/*.so
+**/.libs

diff --git a/tests/topotests/Dockerfile b/tests/topotests/Dockerfile
index 72a876ed83cc2b6c7f79defa104c64a694b4b6f7..3613e23a6e7b9b28071f331bf80d61d9eba06b24 100644 (file)
--- a/tests/topotests/Dockerfile
+++ b/tests/topotests/Dockerfile
@@ -70,7 +70,7 @@ RUN echo "" >> /etc/security/limits.conf; \
     echo "root hard core unlimited" >> /etc/security/limits.conf
 
 # Copy run scripts to facilitate users wanting to run the tests
-COPY docker/inner /opt/topotests
+COPY tests/topotests/docker/inner /opt/topotests
 
 WORKDIR /root/topotests
 ENV PATH "$PATH:/opt/topotests"

diff --git a/tests/topotests/docker/build.sh b/tests/topotests/docker/build.sh
index 344fb2ffcba97958d52e8e152a8fad1752ec72f9..3bb6dbaad8ab17fc93db9ecc2fea88ba296975dc 100755 (executable)
--- a/tests/topotests/docker/build.sh
+++ b/tests/topotests/docker/build.sh
@@ -22,9 +22,10 @@
 # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-cd "$(dirname "$0")"/..
+cd "$(dirname "$0")"/../../..
 
 exec docker build --pull \
                  --compress \
                  -t frrouting/frr:topotests-latest \
+                 -f tests/topotests/Dockerfile \
                  .