Merge pull request #3410 from opensourcerouting/bugfix/topotest-docker-build-context

Revert "tests/topotests: Change docker build context"

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 tests/topotests/docker/inner /opt/topotests
+COPY docker/inner /opt/topotests
 
 WORKDIR /root/topotests
 ENV PATH "$PATH:/opt/topotests"

tests/topotests/docker/build.sh

@@ -22,10 +22,9 @@
 # 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 \
 		  .