Skip to content

Commit 9f4ce6d

Browse files
mblaschkemblaschke
committed
Merge branch 'release/0.50.1'
2 parents c82603e + 8475720 commit 9f4ce6d

File tree

507 files changed

+2527
-2950
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

507 files changed

+2527
-2950
lines changed

‎CHANGELOG.md

+6
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,12 @@ This project adheres to [WebDevOps.io Dockerfile](https://github.com/webdevops/D
44

55
## [1.0.0] - upcoming
66

7+
8+
## [0.50.1] - 2016-05-24
9+
### Changed
10+
- Fixed required root rights for entrypoint, provisioning is now only running when entrypoint is entered with root
11+
- Modularized service.d scripts (will include servide.d/$serv.d/*.sh before execution)
12+
713
## [0.50.0] - 2016-05-23
814
### Changed
915
- Improve image sizes (backported to 0.23.0 due to build issues)

‎docker/apache/alpine-3/conf/bin/service.d/httpd.d/10-init.sh

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then
2+
echo ""
3+
echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!"
4+
echo ""
5+
fi
6+
7+
# Replace markers
8+
find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<DOCUMENT_INDEX>" "$WEB_DOCUMENT_INDEX"
9+
find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<DOCUMENT_ROOT>" "$WEB_DOCUMENT_ROOT"
10+
find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<ALIAS_DOMAIN>" "$WEB_ALIAS_DOMAIN"
11+
find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<SERVERNAME>" "$HOSTNAME"

‎docker/apache/alpine-3/conf/bin/service.d/httpd.sh

+2-11
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,10 @@
11
#!/usr/bin/env bash
22
set -e
3+
source /opt/docker/bin/config.sh
34

4-
if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then
5-
echo ""
6-
echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!"
7-
echo ""
8-
fi
5+
includeScriptDir "/opt/docker/bin/service.d/httpd.d/"
96

107
# Apache gets grumpy about PID files pre-existing
118
rm -f /var/run/httpd/httpd.pid
129

13-
# Replace markers
14-
find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<DOCUMENT_INDEX>" "$WEB_DOCUMENT_INDEX"
15-
find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<DOCUMENT_ROOT>" "$WEB_DOCUMENT_ROOT"
16-
find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<ALIAS_DOMAIN>" "$WEB_ALIAS_DOMAIN"
17-
find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<SERVERNAME>" "$HOSTNAME"
18-
1910
exec /usr/sbin/apachectl -DFOREGROUND

‎docker/apache/centos-7/conf/bin/service.d/httpd.d/10-init.sh

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then
2+
echo ""
3+
echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!"
4+
echo ""
5+
fi
6+
7+
# Replace markers
8+
find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<DOCUMENT_INDEX>" "$WEB_DOCUMENT_INDEX"
9+
find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<DOCUMENT_ROOT>" "$WEB_DOCUMENT_ROOT"
10+
find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<ALIAS_DOMAIN>" "$WEB_ALIAS_DOMAIN"
11+
find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<SERVERNAME>" "$HOSTNAME"

‎docker/apache/centos-7/conf/bin/service.d/httpd.sh

+2-11
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,10 @@
11
#!/usr/bin/env bash
22
set -e
3+
source /opt/docker/bin/config.sh
34

4-
if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then
5-
echo ""
6-
echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!"
7-
echo ""
8-
fi
5+
includeScriptDir "/opt/docker/bin/service.d/httpd.d/"
96

107
# Apache gets grumpy about PID files pre-existing
118
rm -f /var/run/httpd/httpd.pid
129

13-
# Replace markers
14-
find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<DOCUMENT_INDEX>" "$WEB_DOCUMENT_INDEX"
15-
find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<DOCUMENT_ROOT>" "$WEB_DOCUMENT_ROOT"
16-
find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<ALIAS_DOMAIN>" "$WEB_ALIAS_DOMAIN"
17-
find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<SERVERNAME>" "$HOSTNAME"
18-
1910
exec httpd -DFOREGROUND

‎docker/apache/debian-7/conf/bin/service.d/httpd.d/10-init.sh

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then
2+
echo ""
3+
echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!"
4+
echo ""
5+
fi
6+
7+
# Replace markers
8+
find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<DOCUMENT_INDEX>" "$WEB_DOCUMENT_INDEX"
9+
find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<DOCUMENT_ROOT>" "$WEB_DOCUMENT_ROOT"
10+
find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<ALIAS_DOMAIN>" "$WEB_ALIAS_DOMAIN"
11+
find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<SERVERNAME>" "$HOSTNAME"

‎docker/apache/debian-7/conf/bin/service.d/httpd.sh

+3-11
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,12 @@
11
#!/usr/bin/env bash
22
set -e
33

4-
if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then
5-
echo ""
6-
echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!"
7-
echo ""
8-
fi
4+
source /opt/docker/bin/config.sh
5+
6+
includeScriptDir "/opt/docker/bin/service.d/httpd.d/"
97

108
# Apache gets grumpy about PID files pre-existing
119
rm -f /var/run/apache2/apache2*.pid
1210

13-
# Replace markers
14-
find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<DOCUMENT_INDEX>" "$WEB_DOCUMENT_INDEX"
15-
find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<DOCUMENT_ROOT>" "$WEB_DOCUMENT_ROOT"
16-
find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<ALIAS_DOMAIN>" "$WEB_ALIAS_DOMAIN"
17-
find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<SERVERNAME>" "$HOSTNAME"
18-
1911
source /etc/apache2/envvars
2012
exec apache2 -DFOREGROUND -DAPACHE_LOCK_DIR

‎docker/apache/debian-8/conf/bin/service.d/httpd.d/10-init.sh

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then
2+
echo ""
3+
echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!"
4+
echo ""
5+
fi
6+
7+
# Replace markers
8+
find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<DOCUMENT_INDEX>" "$WEB_DOCUMENT_INDEX"
9+
find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<DOCUMENT_ROOT>" "$WEB_DOCUMENT_ROOT"
10+
find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<ALIAS_DOMAIN>" "$WEB_ALIAS_DOMAIN"
11+
find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<SERVERNAME>" "$HOSTNAME"

‎docker/apache/debian-8/conf/bin/service.d/httpd.sh

+3-11
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,12 @@
11
#!/usr/bin/env bash
22
set -e
33

4-
if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then
5-
echo ""
6-
echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!"
7-
echo ""
8-
fi
4+
source /opt/docker/bin/config.sh
5+
6+
includeScriptDir "/opt/docker/bin/service.d/httpd.d/"
97

108
# Apache gets grumpy about PID files pre-existing
119
rm -f /var/run/apache2/apache2*.pid
1210

13-
# Replace markers
14-
find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<DOCUMENT_INDEX>" "$WEB_DOCUMENT_INDEX"
15-
find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<DOCUMENT_ROOT>" "$WEB_DOCUMENT_ROOT"
16-
find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<ALIAS_DOMAIN>" "$WEB_ALIAS_DOMAIN"
17-
find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<SERVERNAME>" "$HOSTNAME"
18-
1911
source /etc/apache2/envvars
2012
exec apache2 -DFOREGROUND -DAPACHE_LOCK_DIR

‎docker/apache/debian-9/conf/bin/service.d/httpd.d/10-init.sh

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then
2+
echo ""
3+
echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!"
4+
echo ""
5+
fi
6+
7+
# Replace markers
8+
find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<DOCUMENT_INDEX>" "$WEB_DOCUMENT_INDEX"
9+
find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<DOCUMENT_ROOT>" "$WEB_DOCUMENT_ROOT"
10+
find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<ALIAS_DOMAIN>" "$WEB_ALIAS_DOMAIN"
11+
find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<SERVERNAME>" "$HOSTNAME"

‎docker/apache/debian-9/conf/bin/service.d/httpd.sh

+3-11
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,12 @@
11
#!/usr/bin/env bash
22
set -e
33

4-
if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then
5-
echo ""
6-
echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!"
7-
echo ""
8-
fi
4+
source /opt/docker/bin/config.sh
5+
6+
includeScriptDir "/opt/docker/bin/service.d/httpd.d/"
97

108
# Apache gets grumpy about PID files pre-existing
119
rm -f /var/run/apache2/apache2*.pid
1210

13-
# Replace markers
14-
find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<DOCUMENT_INDEX>" "$WEB_DOCUMENT_INDEX"
15-
find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<DOCUMENT_ROOT>" "$WEB_DOCUMENT_ROOT"
16-
find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<ALIAS_DOMAIN>" "$WEB_ALIAS_DOMAIN"
17-
find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<SERVERNAME>" "$HOSTNAME"
18-
1911
source /etc/apache2/envvars
2012
exec apache2 -DFOREGROUND -DAPACHE_LOCK_DIR

‎docker/apache/ubuntu-12.04/conf/bin/service.d/httpd.d/10-init.sh

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then
2+
echo ""
3+
echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!"
4+
echo ""
5+
fi
6+
7+
# Replace markers
8+
find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<DOCUMENT_INDEX>" "$WEB_DOCUMENT_INDEX"
9+
find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<DOCUMENT_ROOT>" "$WEB_DOCUMENT_ROOT"
10+
find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<ALIAS_DOMAIN>" "$WEB_ALIAS_DOMAIN"
11+
find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<SERVERNAME>" "$HOSTNAME"

‎docker/apache/ubuntu-12.04/conf/bin/service.d/httpd.sh

+3-11
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,12 @@
11
#!/usr/bin/env bash
22
set -e
33

4-
if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then
5-
echo ""
6-
echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!"
7-
echo ""
8-
fi
4+
source /opt/docker/bin/config.sh
5+
6+
includeScriptDir "/opt/docker/bin/service.d/httpd.d/"
97

108
# Apache gets grumpy about PID files pre-existing
119
rm -f /var/run/apache2/apache2*.pid
1210

13-
# Replace markers
14-
find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<DOCUMENT_INDEX>" "$WEB_DOCUMENT_INDEX"
15-
find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<DOCUMENT_ROOT>" "$WEB_DOCUMENT_ROOT"
16-
find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<ALIAS_DOMAIN>" "$WEB_ALIAS_DOMAIN"
17-
find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<SERVERNAME>" "$HOSTNAME"
18-
1911
source /etc/apache2/envvars
2012
exec apache2 -DFOREGROUND -DAPACHE_LOCK_DIR

‎docker/apache/ubuntu-14.04/conf/bin/service.d/httpd.d/10-init.sh

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then
2+
echo ""
3+
echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!"
4+
echo ""
5+
fi
6+
7+
# Replace markers
8+
find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<DOCUMENT_INDEX>" "$WEB_DOCUMENT_INDEX"
9+
find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<DOCUMENT_ROOT>" "$WEB_DOCUMENT_ROOT"
10+
find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<ALIAS_DOMAIN>" "$WEB_ALIAS_DOMAIN"
11+
find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<SERVERNAME>" "$HOSTNAME"

‎docker/apache/ubuntu-14.04/conf/bin/service.d/httpd.sh

+3-11
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,12 @@
11
#!/usr/bin/env bash
22
set -e
33

4-
if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then
5-
echo ""
6-
echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!"
7-
echo ""
8-
fi
4+
source /opt/docker/bin/config.sh
5+
6+
includeScriptDir "/opt/docker/bin/service.d/httpd.d/"
97

108
# Apache gets grumpy about PID files pre-existing
119
rm -f /var/run/apache2/apache2*.pid
1210

13-
# Replace markers
14-
find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<DOCUMENT_INDEX>" "$WEB_DOCUMENT_INDEX"
15-
find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<DOCUMENT_ROOT>" "$WEB_DOCUMENT_ROOT"
16-
find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<ALIAS_DOMAIN>" "$WEB_ALIAS_DOMAIN"
17-
find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<SERVERNAME>" "$HOSTNAME"
18-
1911
source /etc/apache2/envvars
2012
exec apache2 -DFOREGROUND -DAPACHE_LOCK_DIR

‎docker/apache/ubuntu-15.04/conf/bin/service.d/httpd.d/10-init.sh

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then
2+
echo ""
3+
echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!"
4+
echo ""
5+
fi
6+
7+
# Replace markers
8+
find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<DOCUMENT_INDEX>" "$WEB_DOCUMENT_INDEX"
9+
find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<DOCUMENT_ROOT>" "$WEB_DOCUMENT_ROOT"
10+
find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<ALIAS_DOMAIN>" "$WEB_ALIAS_DOMAIN"
11+
find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<SERVERNAME>" "$HOSTNAME"

‎docker/apache/ubuntu-15.04/conf/bin/service.d/httpd.sh

+3-11
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,12 @@
11
#!/usr/bin/env bash
22
set -e
33

4-
if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then
5-
echo ""
6-
echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!"
7-
echo ""
8-
fi
4+
source /opt/docker/bin/config.sh
5+
6+
includeScriptDir "/opt/docker/bin/service.d/httpd.d/"
97

108
# Apache gets grumpy about PID files pre-existing
119
rm -f /var/run/apache2/apache2*.pid
1210

13-
# Replace markers
14-
find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<DOCUMENT_INDEX>" "$WEB_DOCUMENT_INDEX"
15-
find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<DOCUMENT_ROOT>" "$WEB_DOCUMENT_ROOT"
16-
find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<ALIAS_DOMAIN>" "$WEB_ALIAS_DOMAIN"
17-
find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<SERVERNAME>" "$HOSTNAME"
18-
1911
source /etc/apache2/envvars
2012
exec apache2 -DFOREGROUND -DAPACHE_LOCK_DIR

‎docker/apache/ubuntu-15.10/conf/bin/service.d/httpd.d/10-init.sh

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then
2+
echo ""
3+
echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!"
4+
echo ""
5+
fi
6+
7+
# Replace markers
8+
find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<DOCUMENT_INDEX>" "$WEB_DOCUMENT_INDEX"
9+
find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<DOCUMENT_ROOT>" "$WEB_DOCUMENT_ROOT"
10+
find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<ALIAS_DOMAIN>" "$WEB_ALIAS_DOMAIN"
11+
find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<SERVERNAME>" "$HOSTNAME"

‎docker/apache/ubuntu-15.10/conf/bin/service.d/httpd.sh

+3-11
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,12 @@
11
#!/usr/bin/env bash
22
set -e
33

4-
if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then
5-
echo ""
6-
echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!"
7-
echo ""
8-
fi
4+
source /opt/docker/bin/config.sh
5+
6+
includeScriptDir "/opt/docker/bin/service.d/httpd.d/"
97

108
# Apache gets grumpy about PID files pre-existing
119
rm -f /var/run/apache2/apache2*.pid
1210

13-
# Replace markers
14-
find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<DOCUMENT_INDEX>" "$WEB_DOCUMENT_INDEX"
15-
find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<DOCUMENT_ROOT>" "$WEB_DOCUMENT_ROOT"
16-
find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<ALIAS_DOMAIN>" "$WEB_ALIAS_DOMAIN"
17-
find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<SERVERNAME>" "$HOSTNAME"
18-
1911
source /etc/apache2/envvars
2012
exec apache2 -DFOREGROUND -DAPACHE_LOCK_DIR

‎docker/apache/ubuntu-16.04/conf/bin/service.d/httpd.d/10-init.sh

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then
2+
echo ""
3+
echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!"
4+
echo ""
5+
fi
6+
7+
# Replace markers
8+
find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<DOCUMENT_INDEX>" "$WEB_DOCUMENT_INDEX"
9+
find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<DOCUMENT_ROOT>" "$WEB_DOCUMENT_ROOT"
10+
find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<ALIAS_DOMAIN>" "$WEB_ALIAS_DOMAIN"
11+
find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<SERVERNAME>" "$HOSTNAME"

‎docker/apache/ubuntu-16.04/conf/bin/service.d/httpd.sh

+3-11
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,12 @@
11
#!/usr/bin/env bash
22
set -e
33

4-
if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then
5-
echo ""
6-
echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!"
7-
echo ""
8-
fi
4+
source /opt/docker/bin/config.sh
5+
6+
includeScriptDir "/opt/docker/bin/service.d/httpd.d/"
97

108
# Apache gets grumpy about PID files pre-existing
119
rm -f /var/run/apache2/apache2*.pid
1210

13-
# Replace markers
14-
find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<DOCUMENT_INDEX>" "$WEB_DOCUMENT_INDEX"
15-
find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<DOCUMENT_ROOT>" "$WEB_DOCUMENT_ROOT"
16-
find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<ALIAS_DOMAIN>" "$WEB_ALIAS_DOMAIN"
17-
find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<SERVERNAME>" "$HOSTNAME"
18-
1911
source /etc/apache2/envvars
2012
exec apache2 -DFOREGROUND -DAPACHE_LOCK_DIR

‎docker/base/alpine-3/conf/bin/service.d/dnsmasq.sh renamed to ‎docker/base-app/alpine-3/conf/bin/service.d/dnsmasq.d/10-init.sh

-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
#!/usr/bin/env bash
2-
31
## clear dns file
42
echo > /etc/dnsmasq.d/development
53

@@ -12,5 +10,3 @@ if [ ! -f /etc/resolv.conf.original ]; then
1210
## set dnsmasq to main nameserver
1311
echo "nameserver 127.0.0.1" > /etc/resolv.conf
1412
fi
15-
16-
exec dnsmasq --keep-in-foreground

‎docker/base-app/alpine-3/conf/bin/service.d/dnsmasq.sh

+2-11
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,7 @@
11
#!/usr/bin/env bash
22

3-
## clear dns file
4-
echo > /etc/dnsmasq.d/development
3+
source /opt/docker/bin/config.sh
54

6-
if [ ! -f /etc/resolv.conf.original ]; then
7-
cp -a /etc/resolv.conf /etc/resolv.conf.original
8-
9-
## set forward servers
10-
cat /etc/resolv.conf.original | grep nameserver | sed 's/nameserver /server=/' > /etc/dnsmasq.d/forward
11-
12-
## set dnsmasq to main nameserver
13-
echo "nameserver 127.0.0.1" > /etc/resolv.conf
14-
fi
5+
includeScriptDir "/opt/docker/bin/service.d/dnsmasq.d/"
156

167
exec dnsmasq --keep-in-foreground

0 commit comments

Comments
 (0)