Skip to content

Commit

Permalink
Merge branch 'release/1.3.3'
Browse files Browse the repository at this point in the history
  • Loading branch information
mblaschke committed Feb 3, 2017
2 parents 7eddca8 + 4d17bc4 commit afcbbd4
Show file tree
Hide file tree
Showing 376 changed files with 1,467 additions and 1,932 deletions.
7 changes: 6 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,12 @@
All notable changes to this project will be documented in this file.
This project adheres to [WebDevOps.io Dockerfile](https://github.com/webdevops/Dockerfile).

## [1.3.2] - 2017-01-30
## [1.3.3] - 2017-02-03
- Improve logging (no output of environment variables, eg. php)
- Add xdebug profiler environment variables
- Fix docker installation for samson

## [1.3.2] - 2017-02-01
- Fix new package names for debian-9

## [1.3.1] - 2017-01-30
Expand Down
54 changes: 27 additions & 27 deletions baselayout/usr/local/bin/rpl
Original file line number Diff line number Diff line change
Expand Up @@ -41,29 +41,29 @@ def get_files(filenames, recurse, suffixen, verbose, hidden_files):
if S_ISDIR(perms.st_mode):
if recurse:
if verbose:
sys.stderr.write("Scanning Directory: %s\n" % filename)
sys.stdout.write("Scanning Directory: %s\n" % filename)
for f in os.listdir(filename):
if not hidden_files and f.startswith('.'):
if verbose:
sys.stderr.write("Skipping: %s (hidden)\n"
sys.stdout.write("Skipping: %s (hidden)\n"
% os.path.join(filename, f))
continue
new_files += get_files([os.path.join(filename, f)],
recurse, suffixen, verbose,
hidden_files)
else:
if verbose:
sys.stderr.write("Directory: %s skipped.\n" % filename)
sys.stdout.write("Directory: %s skipped.\n" % filename)
continue
elif S_ISREG(perms.st_mode):
if suffixen != [] and \
not True in [ filename.endswith(s) for s in suffixen ]:
sys.stderr.write("Skipping: %s (suffix not in list)\n"
sys.stdout.write("Skipping: %s (suffix not in list)\n"
% filename)
continue
new_files += [(filename, perms)]
else:
sys.stderr.write("Skipping: %s (not a regular file)\n"
sys.stdout.write("Skipping: %s (not a regular file)\n"
% filename)
return new_files

Expand Down Expand Up @@ -158,28 +158,28 @@ def main():
sys.exit(os.EX_DATAERR)

if new_str == "" and not opts.quiet:
sys.stderr.write("Really DELETE all occurences of %s " % old_str)
sys.stdout.write("Really DELETE all occurences of %s " % old_str)
if opts.ignore_case:
sys.stderr.write("(ignoring case)? (Y/[N]) ")
sys.stdout.write("(ignoring case)? (Y/[N]) ")
else:
sys.stderr.write("(case sensitive)? (Y/[N]) ")
sys.stdout.write("(case sensitive)? (Y/[N]) ")
line = raw_input()
if line != "" and line[0] in "nN":
sys.stderr.write("\nrpl: User cancelled operation.\n")
sys.exit(os.EX_TEMPFAIL)

# Tell the user what is going to happen
if opts.dry_run:
sys.stderr.write("Simulating replacement of \"%s\" with \"%s\" "
sys.stdout.write("Simulating replacement of \"%s\" with \"%s\" "
% (old_str, new_str))
else:
sys.stderr.write("Replacing \"%s\" with \"%s\" " % (old_str, new_str))
if opts.ignore_case: sys.stderr.write("(ignoring case) ")
else: sys.stderr.write("(case sensitive) ")
if opts.whole_words: sys.stderr.write("(whole words only)\n")
else: sys.stderr.write("(partial words matched)\n")
sys.stdout.write("Replacing \"%s\" with \"%s\" " % (old_str, new_str))
if opts.ignore_case: sys.stdout.write("(ignoring case) ")
else: sys.stdout.write("(case sensitive) ")
if opts.whole_words: sys.stdout.write("(whole words only)\n")
else: sys.stdout.write("(partial words matched)\n")
if opts.dry_run and not opts.quiet:
sys.stderr.write("The files listed below would be modified in a replace operation.\n")
sys.stdout.write("The files listed below would be modified in a replace operation.\n")

if opts.escapes:
old_str = unescape(old_str)
Expand Down Expand Up @@ -225,17 +225,17 @@ def main():
% filename)
sys.stderr.write("\nrpl: Error: %s" % e)
if opts.force:
sys.stderr.write("\nrpl: WARNING: New owner/group/perms may not match!\n\n")
sys.stdout.write("\nrpl: WARNING: New owner/group/perms may not match!\n\n")
else:
sys.stderr.write("\nrpl: SKIPPING %s!\n\n" % filename)
sys.stdout.write("\nrpl: SKIPPING %s!\n\n" % filename)
os.unlink(tmp_path)
continue

if opts.verbose and not opts.dry_run:
sys.stderr.write("Processing: %s\n" % filename)
sys.stdout.write("Processing: %s\n" % filename)
elif not opts.quiet and not opts.dry_run:
sys.stderr.write(".")
sys.stderr.flush()
sys.stdout.write(".")
sys.stdout.flush()

# Do the actual work now
matches = blockrepl(f, o, regex, old_str, new_str, 1024)
Expand All @@ -252,21 +252,21 @@ def main():
fn = os.path.realpath(filename)
except OSError, e:
fn = filename
if not opts.quiet: sys.stderr.write(" %s\n" % fn)
if not opts.quiet: sys.stdout.write(" %s\n" % fn)
os.unlink(tmp_path)
total_matches += matches
continue

if opts.prompt:
sys.stderr.write("\nSave '%s' ? ([Y]/N) " % filename)
sys.stdout.write("\nSave '%s' ? ([Y]/N) " % filename)
line = ""
while line == "" or line[0] not in "Yy\nnN":
line = raw_input()
if line[0] in "nN":
sys.stderr.write("Not Saved.\n")
sys.stdout.write("Not Saved.\n")
os.unlink(tmp_path)
continue
sys.stderr.write("Saved.\n")
sys.stdout.write("Saved.\n")

if opts.do_backup:
try: os.rename(filename, filename + "~")
Expand Down Expand Up @@ -295,13 +295,13 @@ def main():
# We're about to exit, give a summary
if not opts.quiet:
if opts.dry_run:
sys.stderr.write("\nA Total of %lu matches found in %lu file%s searched."
sys.stdout.write("\nA Total of %lu matches found in %lu file%s searched."
% (total_matches,
len(files),
len(files) != 1 and "s" or ""))
sys.stderr.write("\nNone replaced (simulation mode).\n")
sys.stdout.write("\nNone replaced (simulation mode).\n")
else:
sys.stderr.write("\nA Total of %lu matches replaced in %lu file%s searched.\n"
sys.stdout.write("\nA Total of %lu matches replaced in %lu file%s searched.\n"
% (total_matches,
len(files),
len(files) != 1 and "s" or ""))
Expand Down
2 changes: 1 addition & 1 deletion docker/ansible/alpine-3/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ FROM webdevops/bootstrap:alpine-3
MAINTAINER info@webdevops.io
LABEL vendor=WebDevOps.io
LABEL io.webdevops.layout=8
LABEL io.webdevops.version=1.3.2
LABEL io.webdevops.version=1.3.3
2 changes: 1 addition & 1 deletion docker/ansible/centos-7/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ FROM webdevops/bootstrap:centos-7
MAINTAINER info@webdevops.io
LABEL vendor=WebDevOps.io
LABEL io.webdevops.layout=8
LABEL io.webdevops.version=1.3.2
LABEL io.webdevops.version=1.3.3
2 changes: 1 addition & 1 deletion docker/ansible/debian-7/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ FROM webdevops/bootstrap:debian-7
MAINTAINER info@webdevops.io
LABEL vendor=WebDevOps.io
LABEL io.webdevops.layout=8
LABEL io.webdevops.version=1.3.2
LABEL io.webdevops.version=1.3.3
2 changes: 1 addition & 1 deletion docker/ansible/debian-8/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ FROM webdevops/bootstrap:debian-8
MAINTAINER info@webdevops.io
LABEL vendor=WebDevOps.io
LABEL io.webdevops.layout=8
LABEL io.webdevops.version=1.3.2
LABEL io.webdevops.version=1.3.3
2 changes: 1 addition & 1 deletion docker/ansible/debian-9/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ FROM webdevops/bootstrap:debian-9
MAINTAINER info@webdevops.io
LABEL vendor=WebDevOps.io
LABEL io.webdevops.layout=8
LABEL io.webdevops.version=1.3.2
LABEL io.webdevops.version=1.3.3
2 changes: 1 addition & 1 deletion docker/ansible/ubuntu-12.04/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ FROM webdevops/bootstrap:ubuntu-12.04
MAINTAINER info@webdevops.io
LABEL vendor=WebDevOps.io
LABEL io.webdevops.layout=8
LABEL io.webdevops.version=1.3.2
LABEL io.webdevops.version=1.3.3
2 changes: 1 addition & 1 deletion docker/ansible/ubuntu-14.04/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ FROM webdevops/bootstrap:ubuntu-14.04
MAINTAINER info@webdevops.io
LABEL vendor=WebDevOps.io
LABEL io.webdevops.layout=8
LABEL io.webdevops.version=1.3.2
LABEL io.webdevops.version=1.3.3
2 changes: 1 addition & 1 deletion docker/ansible/ubuntu-15.04/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ FROM webdevops/bootstrap:ubuntu-15.04
MAINTAINER info@webdevops.io
LABEL vendor=WebDevOps.io
LABEL io.webdevops.layout=8
LABEL io.webdevops.version=1.3.2
LABEL io.webdevops.version=1.3.3
2 changes: 1 addition & 1 deletion docker/ansible/ubuntu-15.10/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ FROM webdevops/bootstrap:ubuntu-15.10
MAINTAINER info@webdevops.io
LABEL vendor=WebDevOps.io
LABEL io.webdevops.layout=8
LABEL io.webdevops.version=1.3.2
LABEL io.webdevops.version=1.3.3
2 changes: 1 addition & 1 deletion docker/ansible/ubuntu-16.04/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ FROM webdevops/bootstrap:ubuntu-16.04
MAINTAINER info@webdevops.io
LABEL vendor=WebDevOps.io
LABEL io.webdevops.layout=8
LABEL io.webdevops.version=1.3.2
LABEL io.webdevops.version=1.3.3
2 changes: 1 addition & 1 deletion docker/apache-dev/alpine-3/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ FROM webdevops/apache:alpine-3
MAINTAINER info@webdevops.io
LABEL vendor=WebDevOps.io
LABEL io.webdevops.layout=8
LABEL io.webdevops.version=1.3.2
LABEL io.webdevops.version=1.3.3

ENV WEB_DOCUMENT_ROOT /app
ENV WEB_DOCUMENT_INDEX index.php
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<WEB_NO_CACHE_PATTERN>" "$WEB_NO_CACHE_PATTERN"
find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<WEB_NO_CACHE_PATTERN>" "$WEB_NO_CACHE_PATTERN" > /dev/null
2 changes: 1 addition & 1 deletion docker/apache-dev/centos-7/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ FROM webdevops/apache:centos-7
MAINTAINER info@webdevops.io
LABEL vendor=WebDevOps.io
LABEL io.webdevops.layout=8
LABEL io.webdevops.version=1.3.2
LABEL io.webdevops.version=1.3.3

ENV WEB_DOCUMENT_ROOT /app
ENV WEB_DOCUMENT_INDEX index.php
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<WEB_NO_CACHE_PATTERN>" "$WEB_NO_CACHE_PATTERN"
find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<WEB_NO_CACHE_PATTERN>" "$WEB_NO_CACHE_PATTERN" > /dev/null
2 changes: 1 addition & 1 deletion docker/apache-dev/debian-7/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ FROM webdevops/apache:debian-7
MAINTAINER info@webdevops.io
LABEL vendor=WebDevOps.io
LABEL io.webdevops.layout=8
LABEL io.webdevops.version=1.3.2
LABEL io.webdevops.version=1.3.3

ENV WEB_DOCUMENT_ROOT /app
ENV WEB_DOCUMENT_INDEX index.php
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<WEB_NO_CACHE_PATTERN>" "$WEB_NO_CACHE_PATTERN"
find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<WEB_NO_CACHE_PATTERN>" "$WEB_NO_CACHE_PATTERN" > /dev/null
2 changes: 1 addition & 1 deletion docker/apache-dev/debian-8/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ FROM webdevops/apache:debian-8
MAINTAINER info@webdevops.io
LABEL vendor=WebDevOps.io
LABEL io.webdevops.layout=8
LABEL io.webdevops.version=1.3.2
LABEL io.webdevops.version=1.3.3

ENV WEB_DOCUMENT_ROOT /app
ENV WEB_DOCUMENT_INDEX index.php
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<WEB_NO_CACHE_PATTERN>" "$WEB_NO_CACHE_PATTERN"
find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<WEB_NO_CACHE_PATTERN>" "$WEB_NO_CACHE_PATTERN" > /dev/null
2 changes: 1 addition & 1 deletion docker/apache-dev/debian-9/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ FROM webdevops/apache:debian-9
MAINTAINER info@webdevops.io
LABEL vendor=WebDevOps.io
LABEL io.webdevops.layout=8
LABEL io.webdevops.version=1.3.2
LABEL io.webdevops.version=1.3.3

ENV WEB_DOCUMENT_ROOT /app
ENV WEB_DOCUMENT_INDEX index.php
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<WEB_NO_CACHE_PATTERN>" "$WEB_NO_CACHE_PATTERN"
find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<WEB_NO_CACHE_PATTERN>" "$WEB_NO_CACHE_PATTERN" > /dev/null
2 changes: 1 addition & 1 deletion docker/apache-dev/ubuntu-12.04/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ FROM webdevops/apache:ubuntu-12.04
MAINTAINER info@webdevops.io
LABEL vendor=WebDevOps.io
LABEL io.webdevops.layout=8
LABEL io.webdevops.version=1.3.2
LABEL io.webdevops.version=1.3.3

ENV WEB_DOCUMENT_ROOT /app
ENV WEB_DOCUMENT_INDEX index.php
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<WEB_NO_CACHE_PATTERN>" "$WEB_NO_CACHE_PATTERN"
find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<WEB_NO_CACHE_PATTERN>" "$WEB_NO_CACHE_PATTERN" > /dev/null
2 changes: 1 addition & 1 deletion docker/apache-dev/ubuntu-14.04/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ FROM webdevops/apache:ubuntu-14.04
MAINTAINER info@webdevops.io
LABEL vendor=WebDevOps.io
LABEL io.webdevops.layout=8
LABEL io.webdevops.version=1.3.2
LABEL io.webdevops.version=1.3.3

ENV WEB_DOCUMENT_ROOT /app
ENV WEB_DOCUMENT_INDEX index.php
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<WEB_NO_CACHE_PATTERN>" "$WEB_NO_CACHE_PATTERN"
find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<WEB_NO_CACHE_PATTERN>" "$WEB_NO_CACHE_PATTERN" > /dev/null
2 changes: 1 addition & 1 deletion docker/apache-dev/ubuntu-15.04/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ FROM webdevops/apache:ubuntu-15.04
MAINTAINER info@webdevops.io
LABEL vendor=WebDevOps.io
LABEL io.webdevops.layout=8
LABEL io.webdevops.version=1.3.2
LABEL io.webdevops.version=1.3.3

ENV WEB_DOCUMENT_ROOT /app
ENV WEB_DOCUMENT_INDEX index.php
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<WEB_NO_CACHE_PATTERN>" "$WEB_NO_CACHE_PATTERN"
find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<WEB_NO_CACHE_PATTERN>" "$WEB_NO_CACHE_PATTERN" > /dev/null
2 changes: 1 addition & 1 deletion docker/apache-dev/ubuntu-15.10/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ FROM webdevops/apache:ubuntu-15.10
MAINTAINER info@webdevops.io
LABEL vendor=WebDevOps.io
LABEL io.webdevops.layout=8
LABEL io.webdevops.version=1.3.2
LABEL io.webdevops.version=1.3.3

ENV WEB_DOCUMENT_ROOT /app
ENV WEB_DOCUMENT_INDEX index.php
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<WEB_NO_CACHE_PATTERN>" "$WEB_NO_CACHE_PATTERN"
find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<WEB_NO_CACHE_PATTERN>" "$WEB_NO_CACHE_PATTERN" > /dev/null
2 changes: 1 addition & 1 deletion docker/apache-dev/ubuntu-16.04/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ FROM webdevops/apache:ubuntu-16.04
MAINTAINER info@webdevops.io
LABEL vendor=WebDevOps.io
LABEL io.webdevops.layout=8
LABEL io.webdevops.version=1.3.2
LABEL io.webdevops.version=1.3.3

ENV WEB_DOCUMENT_ROOT /app
ENV WEB_DOCUMENT_INDEX index.php
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<WEB_NO_CACHE_PATTERN>" "$WEB_NO_CACHE_PATTERN"
find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<WEB_NO_CACHE_PATTERN>" "$WEB_NO_CACHE_PATTERN" > /dev/null
2 changes: 1 addition & 1 deletion docker/apache/alpine-3/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ FROM webdevops/base:alpine-3
MAINTAINER info@webdevops.io
LABEL vendor=WebDevOps.io
LABEL io.webdevops.layout=8
LABEL io.webdevops.version=1.3.2
LABEL io.webdevops.version=1.3.3

ENV WEB_DOCUMENT_ROOT /app
ENV WEB_DOCUMENT_INDEX index.php
Expand Down
10 changes: 5 additions & 5 deletions docker/apache/alpine-3/conf/bin/service.d/httpd.d/10-init.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then
fi

# Replace markers
find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<DOCUMENT_INDEX>" "$WEB_DOCUMENT_INDEX"
find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<DOCUMENT_ROOT>" "$WEB_DOCUMENT_ROOT"
find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<ALIAS_DOMAIN>" "$WEB_ALIAS_DOMAIN"
find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<SERVERNAME>" "$HOSTNAME"
find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<DOCUMENT_INDEX>" "$WEB_DOCUMENT_INDEX" > /dev/null
find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<DOCUMENT_ROOT>" "$WEB_DOCUMENT_ROOT" > /dev/null
find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<ALIAS_DOMAIN>" "$WEB_ALIAS_DOMAIN" > /dev/null
find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<SERVERNAME>" "$HOSTNAME" > /dev/null

if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then
## WEB_PHP_SOCKET is set
find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<PHP_SOCKET>" "$WEB_PHP_SOCKET"
find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<PHP_SOCKET>" "$WEB_PHP_SOCKET" > /dev/null
else
## WEB_PHP_SOCKET is not set, remove PHP files
rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf
Expand Down
2 changes: 1 addition & 1 deletion docker/apache/centos-7/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ FROM webdevops/base:centos-7
MAINTAINER info@webdevops.io
LABEL vendor=WebDevOps.io
LABEL io.webdevops.layout=8
LABEL io.webdevops.version=1.3.2
LABEL io.webdevops.version=1.3.3

ENV WEB_DOCUMENT_ROOT /app
ENV WEB_DOCUMENT_INDEX index.php
Expand Down
10 changes: 5 additions & 5 deletions docker/apache/centos-7/conf/bin/service.d/httpd.d/10-init.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then
fi

# Replace markers
find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<DOCUMENT_INDEX>" "$WEB_DOCUMENT_INDEX"
find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<DOCUMENT_ROOT>" "$WEB_DOCUMENT_ROOT"
find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<ALIAS_DOMAIN>" "$WEB_ALIAS_DOMAIN"
find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<SERVERNAME>" "$HOSTNAME"
find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<DOCUMENT_INDEX>" "$WEB_DOCUMENT_INDEX" > /dev/null
find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<DOCUMENT_ROOT>" "$WEB_DOCUMENT_ROOT" > /dev/null
find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<ALIAS_DOMAIN>" "$WEB_ALIAS_DOMAIN" > /dev/null
find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<SERVERNAME>" "$HOSTNAME" > /dev/null

if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then
## WEB_PHP_SOCKET is set
find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<PHP_SOCKET>" "$WEB_PHP_SOCKET"
find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<PHP_SOCKET>" "$WEB_PHP_SOCKET" > /dev/null
else
## WEB_PHP_SOCKET is not set, remove PHP files
rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf
Expand Down
Loading

0 comments on commit afcbbd4

Please sign in to comment.