Revert "tests/topotests: Change docker build context"

[mirror_frr.git] / tests / topotests / Dockerfile

diff --git a/tests/topotests/Dockerfile b/tests/topotests/Dockerfile
index d7b2cae354f8e0b58e6a60a52cf0767d44f8f80f..72a876ed83cc2b6c7f79defa104c64a694b4b6f7 100644 (file)
--- a/tests/topotests/Dockerfile
+++ b/tests/topotests/Dockerfile
@@ -15,6 +15,7 @@ RUN export DEBIAN_FRONTEND=noninteractive \
         less \
         libtool \
         libjson-c-dev \
+        libpcre3-dev \
         libpython-dev \
         libreadline-dev \
         libc-ares-dev \
@@ -30,6 +31,7 @@ RUN export DEBIAN_FRONTEND=noninteractive \
         tmux \
         valgrind \
         vim \
+        wget \
         x11-xserver-utils \
         xterm \
     && pip install \
@@ -37,6 +39,16 @@ RUN export DEBIAN_FRONTEND=noninteractive \
         ipaddr \
         pytest
 
+RUN cd /tmp \
+    && wget -q https://ci1.netdef.org/artifact/LIBYANG-YANGRELEASE/shared/build-1/Ubuntu-18.04-x86_64-Packages/libyang-dev_0.16.46_amd64.deb \
+         -O libyang-dev.deb \
+    && wget -q https://ci1.netdef.org/artifact/LIBYANG-YANGRELEASE/shared/build-1/Ubuntu-18.04-x86_64-Packages/libyang_0.16.46_amd64.deb \
+         -O libyang.deb \
+    && echo "039252cc66eb254a97e160b1c325af669470cde8a02d73ec9f7b920ed3c7997c  libyang.deb" | sha256sum -c - \
+    && echo "e7e2d5bfc7b33b3218df8bef404432970f9b4ad10d6dbbdcb0e0be2babbb68e9  libyang-dev.deb" | sha256sum -c - \
+    && dpkg -i libyang*.deb \
+    && rm libyang*.deb
+
 RUN groupadd -r -g 92 frr \
     && groupadd -r -g 85 frrvty \
     && useradd -c "FRRouting suite" \
@@ -58,11 +70,12 @@ 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 . /root/topotests
-WORKDIR /root
-ENV PATH "$PATH:/root/topotests/docker"
+COPY docker/inner /opt/topotests
+
+WORKDIR /root/topotests
+ENV PATH "$PATH:/opt/topotests"
 
-RUN echo "cat /root/topotests/docker/motd.txt" >> /root/.profile && \
+RUN echo "cat /opt/topotests/motd.txt" >> /root/.profile && \
       echo "export PS1='(topotests) $PS1'" >> /root/.profile
 
-ENTRYPOINT [ "bash", "/root/topotests/docker/entrypoint.sh" ]
+ENTRYPOINT [ "bash", "/opt/topotests/entrypoint.sh" ]