diff options
Diffstat (limited to 'netcon')
-rw-r--r-- | netcon/README.md | 10 | ||||
-rwxr-xr-x | netcon/docker-test/build_tests.sh | 2 | ||||
-rw-r--r-- | netcon/docker-test/httpd/httpd-2.4.18-1.fc23.x86_64/monitor_dockerfile (renamed from netcon/docker-test/httpd/httpd-2.4.17-3.fc23.x86_64/monitor_dockerfile) | 0 | ||||
-rw-r--r-- | netcon/docker-test/httpd/httpd-2.4.18-1.fc23.x86_64/monitor_entrypoint.sh (renamed from netcon/docker-test/httpd/httpd-2.4.17-3.fc23.x86_64/monitor_entrypoint.sh) | 0 | ||||
-rw-r--r-- | netcon/docker-test/httpd/httpd-2.4.18-1.fc23.x86_64/netcon_dockerfile (renamed from netcon/docker-test/httpd/httpd-2.4.17-3.fc23.x86_64/netcon_dockerfile) | 2 | ||||
-rw-r--r-- | netcon/docker-test/httpd/httpd-2.4.18-1.fc23.x86_64/netcon_entrypoint.sh (renamed from netcon/docker-test/httpd/httpd-2.4.17-3.fc23.x86_64/netcon_entrypoint.sh) | 0 |
6 files changed, 8 insertions, 6 deletions
diff --git a/netcon/README.md b/netcon/README.md index 413efc2b..d694064a 100644 --- a/netcon/README.md +++ b/netcon/README.md @@ -154,9 +154,11 @@ Results will be written to the *netcon/docker-test/_results/* directory which is To run unit tests: -1) Set up your own network at [https://my.zerotier.com/](https://my.zerotier.com/). For our example we'll just use the Earth network (8056c2e21c000001). Use its network id as follows: +1) Disable SELinux. This is so the containers can use a shared volume to exchange MD5 sums and address information. -2) Generate two pairs of identity keys. Each public/private pair will be used by the *netcon* and *monitor* containers: +2) Set up your own network at [https://my.zerotier.com/](https://my.zerotier.com/). For our example we'll just use the Earth network (8056c2e21c000001). Use its network id as follows: + +3) Generate two pairs of identity keys. Each public/private pair will be used by the *netcon* and *monitor* containers: mkdir -p /tmp/netcon_first cp -f ./netcon/liblwip.so /tmp/netcon_first @@ -176,7 +178,7 @@ To run unit tests: ./zerotier-cli -D/tmp/netcon_second join 8056c2e21c000001 kill `cat /tmp/netcon_second/zerotier-one.pid` -3) Copy the identity files to your *docker-test* directory. Names will be altered during copy step so the dockerfiles know which identities to use for each image/container: +4) Copy the identity files to your *docker-test* directory. Names will be altered during copy step so the dockerfiles know which identities to use for each image/container: cp /tmp/netcon_first/identity.public ./netcon/docker-test/netcon_identity.public cp /tmp/netcon_first/identity.secret ./netcon/docker-test/netcon_identity.secret @@ -185,7 +187,7 @@ To run unit tests: cp /tmp/netcon_second/identity.secret ./netcon/docker-test/monitor_identity.secret -4) Place a blank network config file in the *netcon/docker-test* directory (e.g. "8056c2e21c000001.conf") +5) Place a blank network config file in the *netcon/docker-test* directory (e.g. "8056c2e21c000001.conf") - This will be used to inform test-specific scripts what network to use for testing After you've created your network and placed its blank config file in *netcon/docker-test* run the following to perform unit tests for httpd: diff --git a/netcon/docker-test/build_tests.sh b/netcon/docker-test/build_tests.sh index f360124b..65009f18 100755 --- a/netcon/docker-test/build_tests.sh +++ b/netcon/docker-test/build_tests.sh @@ -18,7 +18,7 @@ find . -mindepth 2 -maxdepth 2 -type d | while read testdir; do continue fi - echo "*** Building: '$testdir'..." + echo "\n\n\n*** Building: '$testdir'..." rm _results/*.tmp # Stage scripts diff --git a/netcon/docker-test/httpd/httpd-2.4.17-3.fc23.x86_64/monitor_dockerfile b/netcon/docker-test/httpd/httpd-2.4.18-1.fc23.x86_64/monitor_dockerfile index d2d2a0cb..d2d2a0cb 100644 --- a/netcon/docker-test/httpd/httpd-2.4.17-3.fc23.x86_64/monitor_dockerfile +++ b/netcon/docker-test/httpd/httpd-2.4.18-1.fc23.x86_64/monitor_dockerfile diff --git a/netcon/docker-test/httpd/httpd-2.4.17-3.fc23.x86_64/monitor_entrypoint.sh b/netcon/docker-test/httpd/httpd-2.4.18-1.fc23.x86_64/monitor_entrypoint.sh index c8fca5a3..c8fca5a3 100644 --- a/netcon/docker-test/httpd/httpd-2.4.17-3.fc23.x86_64/monitor_entrypoint.sh +++ b/netcon/docker-test/httpd/httpd-2.4.18-1.fc23.x86_64/monitor_entrypoint.sh diff --git a/netcon/docker-test/httpd/httpd-2.4.17-3.fc23.x86_64/netcon_dockerfile b/netcon/docker-test/httpd/httpd-2.4.18-1.fc23.x86_64/netcon_dockerfile index 90739f10..3053a832 100644 --- a/netcon/docker-test/httpd/httpd-2.4.17-3.fc23.x86_64/netcon_dockerfile +++ b/netcon/docker-test/httpd/httpd-2.4.18-1.fc23.x86_64/netcon_dockerfile @@ -4,7 +4,7 @@ MAINTAINER https://www.zerotier.com/ # Install apps RUN yum -y update -RUN yum -y install httpd-2.4.17-3.fc23.x86_64 +RUN yum -y install httpd-2.4.18-1.fc23.x86_64 RUN yum clean all EXPOSE 9993/udp 80/udp diff --git a/netcon/docker-test/httpd/httpd-2.4.17-3.fc23.x86_64/netcon_entrypoint.sh b/netcon/docker-test/httpd/httpd-2.4.18-1.fc23.x86_64/netcon_entrypoint.sh index d2ab248a..d2ab248a 100644 --- a/netcon/docker-test/httpd/httpd-2.4.17-3.fc23.x86_64/netcon_entrypoint.sh +++ b/netcon/docker-test/httpd/httpd-2.4.18-1.fc23.x86_64/netcon_entrypoint.sh |