summaryrefslogtreecommitdiff
path: root/netcon/docker-test/nginx/nginx-1.8.0-14.fc23.x86_64/netcon_dockerfile
diff options
context:
space:
mode:
authorJoseph Henry <josephjah@gmail.com>2015-12-06 22:37:23 -0800
committerJoseph Henry <josephjah@gmail.com>2015-12-06 22:37:23 -0800
commitafafde257171288d096b3d25532aef81f8ed9764 (patch)
tree3b46db7e1e9c1adcbd7fcd5c72fd92ffb7eabf6c /netcon/docker-test/nginx/nginx-1.8.0-14.fc23.x86_64/netcon_dockerfile
parent1dec034f775c50abdb8b88f002951647cc08a64e (diff)
downloadinfinitytier-afafde257171288d096b3d25532aef81f8ed9764.tar.gz
infinitytier-afafde257171288d096b3d25532aef81f8ed9764.zip
Modified Nginx test scripts
Diffstat (limited to 'netcon/docker-test/nginx/nginx-1.8.0-14.fc23.x86_64/netcon_dockerfile')
-rw-r--r--netcon/docker-test/nginx/nginx-1.8.0-14.fc23.x86_64/netcon_dockerfile2
1 files changed, 1 insertions, 1 deletions
diff --git a/netcon/docker-test/nginx/nginx-1.8.0-14.fc23.x86_64/netcon_dockerfile b/netcon/docker-test/nginx/nginx-1.8.0-14.fc23.x86_64/netcon_dockerfile
index d89c4711..56de6eb4 100644
--- a/netcon/docker-test/nginx/nginx-1.8.0-14.fc23.x86_64/netcon_dockerfile
+++ b/netcon/docker-test/nginx/nginx-1.8.0-14.fc23.x86_64/netcon_dockerfile
@@ -35,7 +35,7 @@ ADD zerotier-cli /
ADD netcon_entrypoint.sh /netcon_entrypoint.sh
RUN chmod -v +x /netcon_entrypoint.sh
-ADD nginx.conf /
+ADD nginx.conf_ /
# Start ZeroTier-One
CMD ["./netcon_entrypoint.sh"]