From 0c3dd2be961400910eeccebaaabba61a7f3993bd Mon Sep 17 00:00:00 2001 From: Joseph Henry Date: Sun, 27 Sep 2015 21:48:38 -0400 Subject: [PATCH] Fixed apache script --- docker-test/Dockerfile | 2 - docker-test/run-apache.sh | 631 +------------------------------------- 2 files changed, 6 insertions(+), 627 deletions(-) diff --git a/docker-test/Dockerfile b/docker-test/Dockerfile index e10c4cc3c..184faed46 100644 --- a/docker-test/Dockerfile +++ b/docker-test/Dockerfile @@ -30,5 +30,3 @@ RUN mkdir -p /var/lib/zerotier-one/networks.d RUN touch /var/lib/zerotier-one/networks.d/e5cd7a9e1c5311ab.conf RUN ./zerotier-one -d -U -p9993 /root/dev/ztest -# Start Applications - diff --git a/docker-test/run-apache.sh b/docker-test/run-apache.sh index 15d72ad65..5af3cc306 100644 --- a/docker-test/run-apache.sh +++ b/docker-test/run-apache.sh @@ -1,627 +1,8 @@ +#!/bin/bash +# Make sure we're not confused by old, incompletely-shutdown httpd +# context after restarting the container. httpd won't start correctly +# if it thinks it is already running. +rm -rf /run/httpd/* /tmp/httpd* - - - - - - - - - - - Fedora-Dockerfiles/run-apache.sh at master · fedora-cloud/Fedora-Dockerfiles · GitHub - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Skip to content - - - - - - - - - - - - - -
- -
-
- - -
-
-
- -
- -
- - - -

- - /Fedora-Dockerfiles - - - - - -

- -
-
-
- -
-
-
- - - -
- -
-

HTTPS clone URL

-
- - - - -
-
- - -
-

Subversion checkout URL

-
- - - - -
-
- - - -
You can clone with -
or
. - - - -
- - - - Download ZIP - -
-
-
- - - - - - - -
- -
- - Branch: - master - - - -
- -
- - - - -
- -
- Fedora-Dockerfiles/apache/run-apache.sh -
-
- - -
-
- @bparees - bparees - -
- do not use apachectl to start in foreground -
-
- -
-

- - 4 - contributors - -

- @twaugh - @sctweedie - @scollier - @bparees - - -
- -
- -
-
-
- -
- Raw - Blame - History -
- - - - -
- -
- 9 lines (6 sloc) - - 257 Bytes -
-
- - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
#!/bin/bash
-
# Make sure we're not confused by old, incompletely-shutdown httpd
# context after restarting the container. httpd won't start correctly
# if it thinks it is already running.
rm -rf /run/httpd/* /tmp/httpd*
-
exec /usr/sbin/httpd -D FOREGROUND
- -
- -
- -Jump to Line - - -
-
-
-
-
- - -
- -
- -
- - - - - - - -
- - - Something went wrong with that request. Please try again. -
- - - - - - - - - - +exec /usr/sbin/httpd -D FOREGROUND