Skip to content

Commit 762612b

Browse files
mblaschkemblaschke
committed
Merge branch 'release/0.22.0'
2 parents 4da7447 + fc95646 commit 762612b

File tree

689 files changed

+9345
-1557
lines changed

Some content is hidden

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

689 files changed

+9345
-1557
lines changed

‎CHANGELOG.md

+6
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@
22
All notable changes to this project will be documented in this file.
33
This project adheres to [WebDevOps.io Dockerfile](https://github.com/webdevops/Dockerfile).
44

5+
## [0.22.0] - 2016-04-03
6+
### Changed
7+
- Introduced base-app for application images
8+
- Added alpine-3 images
9+
- Added sphinx image
10+
511
## [0.21.6] - 2016-03-25
612
### Changed
713
- Refactored directory layout (container -> docker/, .bin -> bin, testsuite -> test/

‎FIXME.md

+3
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,6 @@ Mostly upstream issues (eg. missing or broken packages)
2020

2121
## Debian 9 (PHP 7)
2222
- Missing memcached
23+
24+
## Alpine 3 (PHP5)
25+
- Missing mhash

‎Makefile

+9-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ list:
1111
all: bootstrap base web php hhvm service misc applications
1212

1313
bootstrap: webdevops/bootstrap webdevops/ansible
14-
base: webdevops/base webdevops/storage
14+
base: webdevops/base webdevops/base-app webdevops/storage
1515
service: webdevops/ssh webdevops/vsftp webdevops/postfix
1616

1717
php: webdevops/php webdevops/php-apache webdevops/php-nginx
@@ -21,7 +21,7 @@ web: webdevops/apache webdevops/nginx
2121

2222
applications: webdevops/typo3 webdevops/piwik
2323

24-
misc: webdevops/mail-sandbox
24+
misc: webdevops/mail-sandbox webdevops/sphinx
2525

2626
test:
2727
cd "test/" && make all
@@ -44,6 +44,7 @@ dist-update:
4444
docker pull debian:7
4545
docker pull debian:8
4646
docker pull debian:stretch
47+
docker pull alpine:3.3
4748

4849
rebuild:
4950
# Rebuild all containers but use caching for duplicates
@@ -73,6 +74,9 @@ webdevops/ansible:
7374
webdevops/base:
7475
bash bin/build.sh base "${DOCKER_REPOSITORY}/base" "${DOCKER_TAG_LATEST}"
7576

77+
webdevops/base-app:
78+
bash bin/build.sh base-app "${DOCKER_REPOSITORY}/base-app" "${DOCKER_TAG_LATEST}"
79+
7680
webdevops/php:
7781
bash bin/build.sh php "${DOCKER_REPOSITORY}/php" "${DOCKER_TAG_LATEST}"
7882

@@ -120,3 +124,6 @@ webdevops/piwik:
120124

121125
webdevops/samson-deployment:
122126
bash bin/build.sh samson-deployment "${DOCKER_REPOSITORY}/samson-deployment" "${DOCKER_TAG_LATEST}"
127+
128+
webdevops/sphinx:
129+
bash bin/build.sh sphinx "${DOCKER_REPOSITORY}/sphinx" "${DOCKER_TAG_LATEST}"

‎bin/provision.sh

+13
Original file line numberDiff line numberDiff line change
@@ -215,6 +215,14 @@ function header() {
215215
clearConfiguration base '*'
216216
deployConfiguration base/general base '*'
217217
deployConfiguration base/centos base 'centos-*'
218+
deployConfiguration base/alpine base 'alpine-*'
219+
}
220+
221+
## Build base-app
222+
[[ $(checkBuildTarget base-app) ]] && {
223+
header "base-app"
224+
clearConfiguration base-app '*'
225+
deployConfiguration base-app/general base-app '*'
218226
}
219227

220228
## Build apache
@@ -223,6 +231,7 @@ function header() {
223231
clearConfiguration apache '*'
224232
deployConfiguration apache/general apache '*'
225233
deployConfiguration apache/centos apache 'centos-*'
234+
deployConfiguration apache/alpine apache 'alpine-*'
226235
}
227236

228237
## Build nginx
@@ -231,6 +240,7 @@ function header() {
231240
clearConfiguration nginx '*'
232241
deployConfiguration nginx/general nginx '*'
233242
deployConfiguration nginx/centos nginx 'centos-*'
243+
deployConfiguration nginx/alpine nginx 'alpine-*'
234244
}
235245

236246
## Build hhvm
@@ -263,6 +273,7 @@ function header() {
263273
clearConfiguration php '*'
264274
deployConfiguration php/general php '*'
265275
deployConfiguration php/ubuntu-12.04 php 'ubuntu-12.04'
276+
deployConfiguration php/alpine php 'alpine-*'
266277

267278
# deploy php7 configuration to *-php7 containers
268279
clearConfiguration php 'debian-*-php7'
@@ -275,6 +286,7 @@ function header() {
275286
clearConfiguration php-apache '*'
276287
deployConfiguration apache/general php-apache '*'
277288
deployConfiguration apache/centos php-apache 'centos-*'
289+
deployConfiguration apache/alpine php-apache 'alpine-*'
278290
deployConfiguration php-apache/general php-apache '*'
279291
}
280292

@@ -284,6 +296,7 @@ function header() {
284296
clearConfiguration php-nginx '*'
285297
deployConfiguration nginx/general php-nginx '*'
286298
deployConfiguration nginx/centos php-nginx 'centos-*'
299+
deployConfiguration nginx/alpine php-nginx 'alpine-*'
287300
deployConfiguration php-nginx/general php-nginx '*'
288301
}
289302

‎docker/ansible/alpine-3/Dockerfile

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
#++++++++++++++++++++++++++++++++++++++
2+
# Alpine 3 Ansible Docker container
3+
#++++++++++++++++++++++++++++++++++++++
4+
5+
FROM webdevops/bootstrap:alpine-3
6+
MAINTAINER [email protected]
7+
LABEL vendor=WebDevOps.io
8+
LABEL io.webdevops.layout=6
9+
LABEL io.webdevops.version=0.22.0

‎docker/ansible/centos-7/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@
55
FROM webdevops/bootstrap:centos-7
66
MAINTAINER [email protected]
77
LABEL vendor=WebDevOps.io
8-
LABEL io.webdevops.layout=5
8+
LABEL io.webdevops.layout=6
99
LABEL io.webdevops.version=0.21.0

‎docker/ansible/debian-7/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@
55
FROM webdevops/bootstrap:debian-7
66
MAINTAINER [email protected]
77
LABEL vendor=WebDevOps.io
8-
LABEL io.webdevops.layout=5
8+
LABEL io.webdevops.layout=6
99
LABEL io.webdevops.version=0.21.0

‎docker/ansible/debian-8/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@
55
FROM webdevops/bootstrap:debian-8
66
MAINTAINER [email protected]
77
LABEL vendor=WebDevOps.io
8-
LABEL io.webdevops.layout=5
8+
LABEL io.webdevops.layout=6
99
LABEL io.webdevops.version=0.21.0

‎docker/ansible/debian-9/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@
55
FROM webdevops/bootstrap:debian-9
66
MAINTAINER [email protected]
77
LABEL vendor=WebDevOps.io
8-
LABEL io.webdevops.layout=5
8+
LABEL io.webdevops.layout=6
99
LABEL io.webdevops.version=0.21.0

‎docker/ansible/ubuntu-12.04/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@
55
FROM webdevops/bootstrap:ubuntu-12.04
66
MAINTAINER [email protected]
77
LABEL vendor=WebDevOps.io
8-
LABEL io.webdevops.layout=5
8+
LABEL io.webdevops.layout=6
99
LABEL io.webdevops.version=0.21.0

‎docker/ansible/ubuntu-14.04/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@
55
FROM webdevops/bootstrap:ubuntu-14.04
66
MAINTAINER [email protected]
77
LABEL vendor=WebDevOps.io
8-
LABEL io.webdevops.layout=5
8+
LABEL io.webdevops.layout=6
99
LABEL io.webdevops.version=0.21.0

‎docker/ansible/ubuntu-15.04/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@
55
FROM webdevops/bootstrap:ubuntu-15.04
66
MAINTAINER [email protected]
77
LABEL vendor=WebDevOps.io
8-
LABEL io.webdevops.layout=5
8+
LABEL io.webdevops.layout=6
99
LABEL io.webdevops.version=0.21.0

‎docker/ansible/ubuntu-15.10/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@
55
FROM webdevops/bootstrap:ubuntu-15.10
66
MAINTAINER [email protected]
77
LABEL vendor=WebDevOps.io
8-
LABEL io.webdevops.layout=5
8+
LABEL io.webdevops.layout=6
99
LABEL io.webdevops.version=0.21.0

‎docker/ansible/ubuntu-16.04/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@
55
FROM webdevops/bootstrap:ubuntu-16.04
66
MAINTAINER [email protected]
77
LABEL vendor=WebDevOps.io
8-
LABEL io.webdevops.layout=5
8+
LABEL io.webdevops.layout=6
99
LABEL io.webdevops.version=0.21.0

‎docker/apache/alpine-3/Dockerfile

+34
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
#++++++++++++++++++++++++++++++++++++++
2+
# Alpine 3 Apache Docker container
3+
#++++++++++++++++++++++++++++++++++++++
4+
5+
FROM webdevops/base:alpine-3
6+
MAINTAINER [email protected]
7+
LABEL vendor=WebDevOps.io
8+
LABEL io.webdevops.layout=6
9+
LABEL io.webdevops.version=0.21.0
10+
11+
ENV WEB_DOCUMENT_ROOT /app
12+
ENV WEB_DOCUMENT_INDEX index.php
13+
ENV WEB_ALIAS_DOMAIN *.vm
14+
15+
# Install apache
16+
RUN /usr/local/bin/apk-install \
17+
apache2 \
18+
apache2-utils \
19+
apache2-proxy \
20+
apache2-ssl \
21+
&& sed -ri ' \
22+
s!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g; \
23+
s!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g; \
24+
' /etc/apache2/httpd.conf
25+
26+
# Deploy scripts/configurations
27+
COPY conf/ /opt/docker/
28+
RUN bash /opt/docker/bin/control.sh provision.role.bootstrap webdevops-apache \
29+
&& bash /opt/docker/bin/bootstrap.sh
30+
31+
EXPOSE 80 443
32+
33+
CMD ["supervisord"]
34+

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

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
#!/usr/bin/env bash
2+
set -e
3+
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
9+
10+
# Apache gets grumpy about PID files pre-existing
11+
rm -f /var/run/httpd/httpd.pid
12+
13+
rpl --quiet "<DOCUMENT_INDEX>" "$WEB_DOCUMENT_INDEX" /opt/docker/etc/httpd/*.conf
14+
rpl --quiet "<DOCUMENT_ROOT>" "$WEB_DOCUMENT_ROOT" /opt/docker/etc/httpd/*.conf
15+
rpl --quiet "<ALIAS_DOMAIN>" "$WEB_ALIAS_DOMAIN" /opt/docker/etc/httpd/*.conf
16+
rpl --quiet "<SERVERNAME>" "$HOSTNAME" /opt/docker/etc/httpd/*.conf
17+
18+
exec /usr/sbin/apachectl -DFOREGROUND

‎docker/apache/alpine-3/conf/etc/httpd/global.conf

+39
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
# Settings
2+
TimeOut 1000
3+
ServerName "<SERVERNAME>"
4+
5+
DirectoryIndex <DOCUMENT_INDEX>
6+
DocumentRoot "<DOCUMENT_ROOT>"
7+
8+
<Directory "<DOCUMENT_ROOT>">
9+
Options Indexes FollowSymLinks
10+
AllowOverride All
11+
12+
<IfVersion < 2.4>
13+
Allow from all
14+
</IfVersion>
15+
<IfVersion >= 2.4>
16+
Require all granted
17+
</IfVersion>
18+
</Directory>
19+
20+
21+
LogFormat "[httpd:access] %V:%p %h %l %u %t \"%r\" %>s bytesIn:%I bytesOut:%O reqTime:%T" dockerlog
22+
CustomLog /proc/self/fd/1 dockerlog
23+
ErrorLog /proc/self/fd/2
24+
25+
#######################################
26+
# Faster error documents
27+
#######################################
28+
<Location ~ "(\.jpeg|\.jpg|\.gif|\.png|\.ico|\.js|\.css|\.map|\.json|\.xml|robots\.txt)$">
29+
ErrorDocument 400 "400 Bad Request"
30+
ErrorDocument 401 "401 Unauthorized"
31+
ErrorDocument 403 "403 Forbidden"
32+
ErrorDocument 404 "404 Not Found"
33+
ErrorDocument 405 "405 Method Not Allowed"
34+
35+
ErrorDocument 500 "500 Internal Server Error"
36+
ErrorDocument 501 "501 Not Implemented"
37+
ErrorDocument 502 "502 Bad Gateway"
38+
ErrorDocument 503 "503 Service Unavailable"
39+
</Location>

‎docker/apache/alpine-3/conf/etc/httpd/main.conf

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
Include /opt/docker/etc/httpd/global.conf
2+
Include /opt/docker/etc/httpd/php.conf
3+
Include /opt/docker/etc/httpd/vhost.conf

‎docker/apache/alpine-3/conf/etc/httpd/php.conf

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
2+
<Proxy fcgi://127.0.0.1:9000>
3+
ProxySet connectiontimeout=5 timeout=600
4+
</Proxy>
5+
6+
<FilesMatch \.php$>
7+
SetHandler "proxy:fcgi://127.0.0.1:9000"
8+
</FilesMatch>

‎docker/apache/alpine-3/conf/etc/httpd/ssl/server.crt

+28
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
-----BEGIN CERTIFICATE-----
2+
MIIE1DCCArwCCQDMMwGnSuK0tTANBgkqhkiG9w0BAQsFADAsMRswGQYDVQQKExJE
3+
b2NrZXIgQm9pbGVycGxhdGUxDTALBgNVBAMUBCoudm0wHhcNMTUwNTA0MTcxNDQw
4+
WhcNMjUwNTAxMTcxNDQwWjAsMRswGQYDVQQKExJEb2NrZXIgQm9pbGVycGxhdGUx
5+
DTALBgNVBAMUBCoudm0wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDK
6+
3TIUiyDvXelWeY9VXMrpjuZtYpVSDsACLpjFUhMnsP5/iKT0VbeZyqHvmwZjAg4G
7+
Y10d+yZDdgv/xeu0HPOFbtR6pCp10d1tdLHZto5Cyuxu7IQsAVjnD6Ko7XFwtNk7
8+
9o6JZfAFaGL4w5MokrVmCtspnsMZH7/7zU4f96cbF39zLopnpuXGD6t6DA8Qj3gy
9+
0duaTjs42bYRN+rwLzVKAev99iQ4kPMJn4vV6/Xk6rtoSzC67GQyVZYaFypicD1S
10+
NtsRmgEVvjCBDbrLOneUiRwff6qxEsZi7Hxv7BKFj4iUWnII7K/nP7T6uBHQjHO+
11+
FpsGkU9lCMrCeVFBe8kKz/cbhd+yLUxXwAPr6gSOPmwn232Gy4tozvqZHpbUxsgx
12+
7sT3ej9K66h1D7J+BjNFWYM1hbnC1r7H/xS7EBzBV8qRoQCVe08Juf5xsouXFakD
13+
clLV4+L+1cxkpwsCQDly5g3tm/TBqA2O+ZJ+YHQDHKkzMyhLs6i0X/M5qvJBiLg1
14+
GLTCS20rpQ5gXTEGuINqHgwXQWkUO6bhgSYqdHGX3zbZ5+qWpI4eui3dHZ1Ll0VH
15+
6Icpb7ORTQwhc6W8KBlybssYPSlGOEBGUjYGNheoz9FpoSkxCis+P8ZNKtrmpPoq
16+
Su0eOOGFOFHG02eOgPVxSwrDeN9MVJo7BPysGMHJmQIDAQABMA0GCSqGSIb3DQEB
17+
CwUAA4ICAQC63g6NHmQKbiy3G6iaDkpUSbr5Mq2YgU61XnvWVyREqDcy/BXCw9oY
18+
SJ/KUvCpqPnACNOFqjadRAmPiA9nf2WduoCgwQGV/YRFGswSuVvh/3X2TX5NWvbS
19+
t8MQDttQg1dxpiMUjlu3rqhfohBdWJvp2lVSdpDb/MOlXBc/+p7HfOHwhqB7wwPN
20+
NNbSKUbZqZxmD8cOf1X0hASr1yfFPj+2vST3ESaON8S0T2p63YX/sD5jvOUiEuyw
21+
I5WcvLmiRZA07SH8nWyckLY3qWL+OlhSZrlAnolWS00b+7h5LNuRYEjKzwVgntoA
22+
aCopyQih6wIk0+AfJO4sfhJBmQhnIrAaP/zwBH5g9zVizLf5H7U+hNXrMwgw55Sq
23+
vjMdkZHvPKUXTvVit/rYE9H+PY3brkRWzOl4V/i/ZLJJm5805H/NyTbz9kPMJw2Q
24+
nn+KOpfXXySD39f8iuRgSKXsYNul38hxWgcZZ6g+sOOp2n/VUmf0eZUWNnJ8i7AP
25+
4Qif7aDKMcibOwSwsB+DKZXDvZ5XSdnMphtuLS5rPSL81rVRmWC2DMfQ2eP8j0WN
26+
VTroSk0xedQ7Qr+9TNooi9IyzX6n1a2S1UiciEZ3ZcDbXPl/P01m+IYZyPnLv0+9
27+
ZeioZYh1JLv3/OKsMrMLTfh2ZCj3aXwmc2Owi/wU2LS5QUOMcHH7CQ==
28+
-----END CERTIFICATE-----

‎docker/apache/alpine-3/conf/etc/httpd/ssl/server.csr

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
-----BEGIN CERTIFICATE REQUEST-----
2+
MIIEcTCCAlkCAQAwLDEbMBkGA1UEChMSRG9ja2VyIEJvaWxlcnBsYXRlMQ0wCwYD
3+
VQQDFAQqLnZtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyt0yFIsg
4+
713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik9FW3mcqh75sGYwIOBmNdHfsm
5+
Q3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyELAFY5w+iqO1xcLTZO/aOiWXw
6+
BWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6KZ6blxg+regwPEI94MtHbmk47
7+
ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEswuuxkMlWWGhcqYnA9UjbbEZoB
8+
Fb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpyCOyv5z+0+rgR0IxzvhabBpFP
9+
ZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9hsuLaM76mR6W1MbIMe7E93o/
10+
SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEAlXtPCbn+cbKLlxWpA3JS1ePi
11+
/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMoS7OotF/zOaryQYi4NRi0wktt
12+
K6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efqlqSOHrot3R2dS5dFR+iHKW+z
13+
kU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEpMQorPj/GTSra5qT6KkrtHjjh
14+
hThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEAAaAAMA0GCSqGSIb3DQEBCwUA
15+
A4ICAQBsEBgC2YepuZq/8UqvKMZKVy/etDKXj7BB+QPb+leNiKD7p4LDxHJsZSH8
16+
Ku9uMPeLfiQDn5jA41k5SlGttzvObd65RdEbO3yHpqsg05EGSDDLfaE1k2Al/qmX
17+
/o8roPZF7+2kZthgMAgkcokS54LYqEYTGqOf3J9Ss0yRIZwhaOVebfFIbIOdpw0B
18+
JNMIJPHTMdZrcuRVI+wR1uPLIlEJzBvxTGbTrvPU25WJFtu+EajKqXO0SHdy0yx8
19+
uH4ykRBJRc36+oYo7nZ5D56dh7pZn3+9J64FKAOV0Q3KqMFieGy053ezuhJd70eZ
20+
UozTgfjs3WpMzoYmKETSyl3XZSdInRe+sUlKPruTsKyg69oYxjPlrGfAmmGcCFca
21+
TnZinT18dI92zK7OtOVkmYeYKC1lwuhftVrNMXzZuHOGpS9NNYtc4nDqDMIEOfV3
22+
6rCdu03WjEgJ+Z67tJs16xOx9du4/EHxS2Ijn9DPfVJvYy0TgzDi1BUpjWx0KTLx
23+
C4OQbEZ/QTWmHVbSch/hcZhzbf7SNh5RpnW4EtmcpDFjIKMfxJmoKeiTf7qnilx0
24+
7uRvsZFKoDKRDOFiPfgMg5AOtLHziYsd9m0tJjC2GHvFuPjzOtzhnUUjmmvht170
25+
2aqKakjST4amg7jzLcs871HX0/WjOtt29NpOz140blkKf1bisg==
26+
-----END CERTIFICATE REQUEST-----

0 commit comments

Comments
 (0)