diff options
| -rw-r--r-- | .dockerignore | 6 | ||||
| -rw-r--r-- | tests/topotests/Dockerfile | 2 | ||||
| -rwxr-xr-x | tests/topotests/docker/build.sh | 3 |
3 files changed, 9 insertions, 2 deletions
diff --git a/.dockerignore b/.dockerignore index 6b8710a711..f2fc34583d 100644 --- 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 72a876ed83..3613e23a6e 100644 --- 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 344fb2ffcb..3bb6dbaad8 100755 --- 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 \ . |