diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2016-01-21 16:03:14 -0800 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2016-01-21 16:03:14 -0800 |
| commit | 935f00ad4cc883fbdb572c39584ab34dff7d0f12 (patch) | |
| tree | 92fe711d5db54067a024d6fdc4298ab2d2e43c16 /netcon/docker-test/httpd | |
| parent | bafdb54752e8e953715a6547d13716b9c59e9d53 (diff) | |
| parent | bccd60125b5bf51a038bbd7951fb68bbc28df99f (diff) | |
| download | infinitytier-935f00ad4cc883fbdb572c39584ab34dff7d0f12.tar.gz infinitytier-935f00ad4cc883fbdb572c39584ab34dff7d0f12.zip | |
Merge branch 'edge' of http://10.6.6.2/zerotier/ZeroTierOne into edge
Diffstat (limited to 'netcon/docker-test/httpd')
| -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 |
4 files changed, 1 insertions, 1 deletions
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 |