From 9b73d604f5ea8583a335187fcf5d22fdc455dfae Mon Sep 17 00:00:00 2001 From: Olof Hagsand Date: Mon, 11 Feb 2019 16:46:28 +0100 Subject: [PATCH] travis make test --- README.md | 2 +- doc/FAQ.md | 2 +- docker/README.md | 2 +- docker/system/Makefile.in | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 70155788..89a771a2 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ support. * [Runtime](#runtime) * [Clixon project page](http://www.clicon.org) * [Tests](test/README.md) - * [Docker](docker/README.md) + * [Clixon containers](docker/README.md) * [Roadmap](ROADMAP.md) * [Reference manual](#reference) diff --git a/doc/FAQ.md b/doc/FAQ.md index 260e951d..f39f7c4d 100644 --- a/doc/FAQ.md +++ b/doc/FAQ.md @@ -241,7 +241,7 @@ The example below shows enabling a specific feature; enabling all features in mo Features can be probed by using RFC 7895 Yang module library which provides information on all modules and which features are enabled. -## Can I run Clixon as docker containers? +## Can I run Clixon as a container? Yes, Clixon has two examples on how to build docker containers. A [base](../docker/base) image and a complete [example system](../docker/system). diff --git a/docker/README.md b/docker/README.md index 01f4d21a..ad190774 100644 --- a/docker/README.md +++ b/docker/README.md @@ -1,4 +1,4 @@ -# Clixon container images +# Clixon containers This directory contains sub-directories with examples of Clixon docker images: diff --git a/docker/system/Makefile.in b/docker/system/Makefile.in index b86620f0..f0a059d3 100644 --- a/docker/system/Makefile.in +++ b/docker/system/Makefile.in @@ -63,8 +63,8 @@ docker: clixon Dockerfile # Start the clixon system container and run the test script test: docker - ./start.sh - sudo docker exec -it clixon-system bash -c 'cd /clixon/clixon/test; exec ./all.sh' + ./cleanup.sh ; ./start.sh # kill (ignore error) and the start it + sudo docker exec -it clixon-system bash -c 'cd /clixon/clixon/test && ./all.sh' push: