Skip to content

Commit 9bc98d6

Browse files
mblaschkemblaschke
committed
Merge branch 'release/0.50.2'
2 parents 9f4ce6d + c247d88 commit 9bc98d6

File tree

235 files changed

+503
-369
lines changed

Some content is hidden

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

235 files changed

+503
-369
lines changed

‎CHANGELOG.md

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

55
## [1.0.0] - upcoming
66

7+
## [0.50.2] - 2016-05-27
8+
### Changed
9+
- Fix /opt/docker/bin/service.d/php-fpm.sh using php.d instead of php-fpm.d
10+
- Restructured documentation, Added customization section
711

812
## [0.50.1] - 2016-05-24
913
### Changed

‎docker/ansible/alpine-3/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ FROM webdevops/bootstrap:alpine-3
88
MAINTAINER [email protected]
99
LABEL vendor=WebDevOps.io
1010
LABEL io.webdevops.layout=7
11-
LABEL io.webdevops.version=0.50.0
11+
LABEL io.webdevops.version=0.50.2

‎docker/ansible/centos-7/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ FROM webdevops/bootstrap:centos-7
88
MAINTAINER [email protected]
99
LABEL vendor=WebDevOps.io
1010
LABEL io.webdevops.layout=7
11-
LABEL io.webdevops.version=0.50.0
11+
LABEL io.webdevops.version=0.50.2

‎docker/ansible/debian-7/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ FROM webdevops/bootstrap:debian-7
88
MAINTAINER [email protected]
99
LABEL vendor=WebDevOps.io
1010
LABEL io.webdevops.layout=7
11-
LABEL io.webdevops.version=0.50.0
11+
LABEL io.webdevops.version=0.50.2

‎docker/ansible/debian-8/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ FROM webdevops/bootstrap:debian-8
88
MAINTAINER [email protected]
99
LABEL vendor=WebDevOps.io
1010
LABEL io.webdevops.layout=7
11-
LABEL io.webdevops.version=0.50.0
11+
LABEL io.webdevops.version=0.50.2

‎docker/ansible/debian-9/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ FROM webdevops/bootstrap:debian-9
88
MAINTAINER [email protected]
99
LABEL vendor=WebDevOps.io
1010
LABEL io.webdevops.layout=7
11-
LABEL io.webdevops.version=0.50.0
11+
LABEL io.webdevops.version=0.50.2

‎docker/ansible/ubuntu-12.04/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ FROM webdevops/bootstrap:ubuntu-12.04
88
MAINTAINER [email protected]
99
LABEL vendor=WebDevOps.io
1010
LABEL io.webdevops.layout=7
11-
LABEL io.webdevops.version=0.50.0
11+
LABEL io.webdevops.version=0.50.2

‎docker/ansible/ubuntu-14.04/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ FROM webdevops/bootstrap:ubuntu-14.04
88
MAINTAINER [email protected]
99
LABEL vendor=WebDevOps.io
1010
LABEL io.webdevops.layout=7
11-
LABEL io.webdevops.version=0.50.0
11+
LABEL io.webdevops.version=0.50.2

‎docker/ansible/ubuntu-15.04/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ FROM webdevops/bootstrap:ubuntu-15.04
88
MAINTAINER [email protected]
99
LABEL vendor=WebDevOps.io
1010
LABEL io.webdevops.layout=7
11-
LABEL io.webdevops.version=0.50.0
11+
LABEL io.webdevops.version=0.50.2

‎docker/ansible/ubuntu-15.10/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ FROM webdevops/bootstrap:ubuntu-15.10
88
MAINTAINER [email protected]
99
LABEL vendor=WebDevOps.io
1010
LABEL io.webdevops.layout=7
11-
LABEL io.webdevops.version=0.50.0
11+
LABEL io.webdevops.version=0.50.2

‎docker/ansible/ubuntu-16.04/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ FROM webdevops/bootstrap:ubuntu-16.04
88
MAINTAINER [email protected]
99
LABEL vendor=WebDevOps.io
1010
LABEL io.webdevops.layout=7
11-
LABEL io.webdevops.version=0.50.0
11+
LABEL io.webdevops.version=0.50.2

‎docker/apache/alpine-3/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ FROM webdevops/base:alpine-3
88
MAINTAINER [email protected]
99
LABEL vendor=WebDevOps.io
1010
LABEL io.webdevops.layout=7
11-
LABEL io.webdevops.version=0.50.0
11+
LABEL io.webdevops.version=0.50.2
1212

1313
ENV WEB_DOCUMENT_ROOT /app
1414
ENV WEB_DOCUMENT_INDEX index.php

‎docker/apache/centos-7/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ FROM webdevops/base:centos-7
88
MAINTAINER [email protected]
99
LABEL vendor=WebDevOps.io
1010
LABEL io.webdevops.layout=7
11-
LABEL io.webdevops.version=0.50.0
11+
LABEL io.webdevops.version=0.50.2
1212

1313
ENV WEB_DOCUMENT_ROOT /app
1414
ENV WEB_DOCUMENT_INDEX index.php

‎docker/apache/debian-7/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ FROM webdevops/base:debian-7
88
MAINTAINER [email protected]
99
LABEL vendor=WebDevOps.io
1010
LABEL io.webdevops.layout=7
11-
LABEL io.webdevops.version=0.50.0
11+
LABEL io.webdevops.version=0.50.2
1212

1313
ENV WEB_DOCUMENT_ROOT /app
1414
ENV WEB_DOCUMENT_INDEX index.php

‎docker/apache/debian-8/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ FROM webdevops/base:debian-8
88
MAINTAINER [email protected]
99
LABEL vendor=WebDevOps.io
1010
LABEL io.webdevops.layout=7
11-
LABEL io.webdevops.version=0.50.0
11+
LABEL io.webdevops.version=0.50.2
1212

1313
ENV WEB_DOCUMENT_ROOT /app
1414
ENV WEB_DOCUMENT_INDEX index.php

‎docker/apache/debian-9/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ FROM webdevops/base:debian-9
88
MAINTAINER [email protected]
99
LABEL vendor=WebDevOps.io
1010
LABEL io.webdevops.layout=7
11-
LABEL io.webdevops.version=0.50.0
11+
LABEL io.webdevops.version=0.50.2
1212

1313
ENV WEB_DOCUMENT_ROOT /app
1414
ENV WEB_DOCUMENT_INDEX index.php

‎docker/apache/ubuntu-12.04/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-12.04
88
MAINTAINER [email protected]
99
LABEL vendor=WebDevOps.io
1010
LABEL io.webdevops.layout=7
11-
LABEL io.webdevops.version=0.50.0
11+
LABEL io.webdevops.version=0.50.2
1212

1313
ENV WEB_DOCUMENT_ROOT /app
1414
ENV WEB_DOCUMENT_INDEX index.php

‎docker/apache/ubuntu-14.04/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-14.04
88
MAINTAINER [email protected]
99
LABEL vendor=WebDevOps.io
1010
LABEL io.webdevops.layout=7
11-
LABEL io.webdevops.version=0.50.0
11+
LABEL io.webdevops.version=0.50.2
1212

1313
ENV WEB_DOCUMENT_ROOT /app
1414
ENV WEB_DOCUMENT_INDEX index.php

‎docker/apache/ubuntu-15.04/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-15.04
88
MAINTAINER [email protected]
99
LABEL vendor=WebDevOps.io
1010
LABEL io.webdevops.layout=7
11-
LABEL io.webdevops.version=0.50.0
11+
LABEL io.webdevops.version=0.50.2
1212

1313
ENV WEB_DOCUMENT_ROOT /app
1414
ENV WEB_DOCUMENT_INDEX index.php

‎docker/apache/ubuntu-15.10/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-15.10
88
MAINTAINER [email protected]
99
LABEL vendor=WebDevOps.io
1010
LABEL io.webdevops.layout=7
11-
LABEL io.webdevops.version=0.50.0
11+
LABEL io.webdevops.version=0.50.2
1212

1313
ENV WEB_DOCUMENT_ROOT /app
1414
ENV WEB_DOCUMENT_INDEX index.php

‎docker/apache/ubuntu-16.04/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-16.04
88
MAINTAINER [email protected]
99
LABEL vendor=WebDevOps.io
1010
LABEL io.webdevops.layout=7
11-
LABEL io.webdevops.version=0.50.0
11+
LABEL io.webdevops.version=0.50.2
1212

1313
ENV WEB_DOCUMENT_ROOT /app
1414
ENV WEB_DOCUMENT_INDEX index.php

‎docker/base-app/alpine-3/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ FROM webdevops/base:alpine-3
88
MAINTAINER [email protected]
99
LABEL vendor=WebDevOps.io
1010
LABEL io.webdevops.layout=7
11-
LABEL io.webdevops.version=0.50.0
11+
LABEL io.webdevops.version=0.50.2
1212

1313
ENV APPLICATION_USER application
1414
ENV APPLICATION_GROUP application

‎docker/base-app/centos-7/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ FROM webdevops/base:centos-7
88
MAINTAINER [email protected]
99
LABEL vendor=WebDevOps.io
1010
LABEL io.webdevops.layout=7
11-
LABEL io.webdevops.version=0.50.0
11+
LABEL io.webdevops.version=0.50.2
1212

1313
ENV APPLICATION_USER application
1414
ENV APPLICATION_GROUP application

‎docker/base-app/debian-7/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ FROM webdevops/base:debian-7
88
MAINTAINER [email protected]
99
LABEL vendor=WebDevOps.io
1010
LABEL io.webdevops.layout=7
11-
LABEL io.webdevops.version=0.50.0
11+
LABEL io.webdevops.version=0.50.2
1212

1313
ENV APPLICATION_USER application
1414
ENV APPLICATION_GROUP application

‎docker/base-app/debian-8/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ FROM webdevops/base:debian-8
88
MAINTAINER [email protected]
99
LABEL vendor=WebDevOps.io
1010
LABEL io.webdevops.layout=7
11-
LABEL io.webdevops.version=0.50.0
11+
LABEL io.webdevops.version=0.50.2
1212

1313
ENV APPLICATION_USER application
1414
ENV APPLICATION_GROUP application

‎docker/base-app/debian-9/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ FROM webdevops/base:debian-9
88
MAINTAINER [email protected]
99
LABEL vendor=WebDevOps.io
1010
LABEL io.webdevops.layout=7
11-
LABEL io.webdevops.version=0.50.0
11+
LABEL io.webdevops.version=0.50.2
1212

1313
ENV APPLICATION_USER application
1414
ENV APPLICATION_GROUP application

‎docker/base-app/ubuntu-12.04/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-12.04
88
MAINTAINER [email protected]
99
LABEL vendor=WebDevOps.io
1010
LABEL io.webdevops.layout=7
11-
LABEL io.webdevops.version=0.50.0
11+
LABEL io.webdevops.version=0.50.2
1212

1313
ENV APPLICATION_USER application
1414
ENV APPLICATION_GROUP application

‎docker/base-app/ubuntu-14.04/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-14.04
88
MAINTAINER [email protected]
99
LABEL vendor=WebDevOps.io
1010
LABEL io.webdevops.layout=7
11-
LABEL io.webdevops.version=0.50.0
11+
LABEL io.webdevops.version=0.50.2
1212

1313
ENV APPLICATION_USER application
1414
ENV APPLICATION_GROUP application

‎docker/base-app/ubuntu-15.04/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-15.04
88
MAINTAINER [email protected]
99
LABEL vendor=WebDevOps.io
1010
LABEL io.webdevops.layout=7
11-
LABEL io.webdevops.version=0.50.0
11+
LABEL io.webdevops.version=0.50.2
1212

1313
ENV APPLICATION_USER application
1414
ENV APPLICATION_GROUP application

‎docker/base-app/ubuntu-15.10/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-15.10
88
MAINTAINER [email protected]
99
LABEL vendor=WebDevOps.io
1010
LABEL io.webdevops.layout=7
11-
LABEL io.webdevops.version=0.50.0
11+
LABEL io.webdevops.version=0.50.2
1212

1313
ENV APPLICATION_USER application
1414
ENV APPLICATION_GROUP application

‎docker/base-app/ubuntu-16.04/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-16.04
88
MAINTAINER [email protected]
99
LABEL vendor=WebDevOps.io
1010
LABEL io.webdevops.layout=7
11-
LABEL io.webdevops.version=0.50.0
11+
LABEL io.webdevops.version=0.50.2
1212

1313
ENV APPLICATION_USER application
1414
ENV APPLICATION_GROUP application

‎docker/base/alpine-3/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ FROM webdevops/bootstrap:alpine-3
88
MAINTAINER [email protected]
99
LABEL vendor=WebDevOps.io
1010
LABEL io.webdevops.layout=7
11-
LABEL io.webdevops.version=0.50.0
11+
LABEL io.webdevops.version=0.50.2
1212

1313
ENV DOCKER_CONF_HOME /opt/docker/
1414

‎docker/base/alpine-3/conf/bin/control.sh

+15-15
Original file line numberDiff line numberDiff line change
@@ -20,79 +20,79 @@ case "$CONTROL_COMMAND" in
2020

2121
## main roles
2222
"provision.role")
23-
deprecationNotice " Please use >>/opt/docker/bin/proviation add --tag bootstrap --tag build --tag onbuild [role]<< for adding provision roles"
23+
deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild [role]<< for adding provision roles"
2424
/opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --tag entrypoint "$1"
2525
;;
2626

2727
"provision.role.bootstrap")
28-
deprecationNotice " Please use >>/opt/docker/bin/proviation add --tag bootstrap [role]<< for adding provision roles"
28+
deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap [role]<< for adding provision roles"
2929
/opt/docker/bin/provision add --tag bootstrap "$1"
3030
;;
3131

3232
"provision.role.build")
33-
deprecationNotice " Please use >>/opt/docker/bin/proviation add --tag build [role]<< for adding provision roles"
33+
deprecationNotice " Please use >>/opt/docker/bin/provision add --tag build [role]<< for adding provision roles"
3434
/opt/docker/bin/provision add --tag build "$1"
3535
;;
3636

3737
"provision.role.onbuild")
38-
deprecationNotice " Please use >>/opt/docker/bin/proviation add --tag onbuild [role]<< for adding provision roles"
38+
deprecationNotice " Please use >>/opt/docker/bin/provision add --tag onbuild [role]<< for adding provision roles"
3939
/opt/docker/bin/provision add --tag onbuild "$1"
4040
;;
4141

4242
"provision.role.entrypoint")
43-
deprecationNotice " Please use >>/opt/docker/bin/proviation add --tag entrypoint [role]<< for adding provision roles"
43+
deprecationNotice " Please use >>/opt/docker/bin/provision add --tag entrypoint [role]<< for adding provision roles"
4444
/opt/docker/bin/provision add --tag entrypoint "$1"
4545
;;
4646

4747
## startup roles
4848
"provision.role.startup")
49-
deprecationNotice " Please use >>/opt/docker/bin/proviation add --tag bootstrap --tag build --tag onbuild --priority 50 [role]<< for adding provision roles"
49+
deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --priority 50 [role]<< for adding provision roles"
5050
/opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --tag entrypoint --priority 50 "$1"
5151
;;
5252

5353
"provision.role.startup.bootstrap")
54-
deprecationNotice " Please use >>/opt/docker/bin/proviation add --tag bootstrap --priority 50 [role]<< for adding provision roles"
54+
deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --priority 50 [role]<< for adding provision roles"
5555
/opt/docker/bin/provision add --tag bootstrap --priority 50 "$1"
5656
;;
5757

5858
"provision.role.startup.build")
59-
deprecationNotice " Please use >>/opt/docker/bin/proviation add --tag build --priority 50 [role]<< for adding provision roles"
59+
deprecationNotice " Please use >>/opt/docker/bin/provision add --tag build --priority 50 [role]<< for adding provision roles"
6060
/opt/docker/bin/provision add --tag build --priority 50 "$1"
6161
;;
6262

6363
"provision.role.startup.onbuild")
64-
deprecationNotice " Please use >>/opt/docker/bin/proviation add --tag onbuild --priority 50 [role]<< for adding provision roles"
64+
deprecationNotice " Please use >>/opt/docker/bin/provision add --tag onbuild --priority 50 [role]<< for adding provision roles"
6565
/opt/docker/bin/provision add --tag onbuild --priority 50 "$1"
6666
;;
6767

6868
"provision.role.startup.entrypoint")
69-
deprecationNotice " Please use >>/opt/docker/bin/proviation add --tag entrypoint --priority 50 [role]<< for adding provision roles"
69+
deprecationNotice " Please use >>/opt/docker/bin/provision add --tag entrypoint --priority 50 [role]<< for adding provision roles"
7070
/opt/docker/bin/provision add --tag entrypoint --priority 50 "$1"
7171
;;
7272

7373
## finish roles
7474
"provision.role.finish")
75-
deprecationNotice " Please use >>/opt/docker/bin/proviation add --tag bootstrap --tag build --tag onbuild --priority 200 [role]<< for adding provision roles"
75+
deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --priority 200 [role]<< for adding provision roles"
7676
/opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --tag entrypoint --priority 200 "$1"
7777
;;
7878

7979
"provision.role.finish.bootstrap")
80-
deprecationNotice " Please use >>/opt/docker/bin/proviation add --tag bootstrap --priority 200 [role]<< for adding provision roles"
80+
deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --priority 200 [role]<< for adding provision roles"
8181
/opt/docker/bin/provision add --tag bootstrap --priority 200 "$1"
8282
;;
8383

8484
"provision.role.finish.build")
85-
deprecationNotice " Please use >>/opt/docker/bin/proviation add --tag build --priority 200 [role]<< for adding provision roles"
85+
deprecationNotice " Please use >>/opt/docker/bin/provision add --tag build --priority 200 [role]<< for adding provision roles"
8686
/opt/docker/bin/provision add --tag build --priority 200 "$1"
8787
;;
8888

8989
"provision.role.finish.onbuild")
90-
deprecationNotice " Please use >>/opt/docker/bin/proviation add --tag onbuild --priority 200 [role]<< for adding provision roles"
90+
deprecationNotice " Please use >>/opt/docker/bin/provision add --tag onbuild --priority 200 [role]<< for adding provision roles"
9191
/opt/docker/bin/provision add --tag onbuild --priority 200 "$1"
9292
;;
9393

9494
"provision.role.finish.entrypoint")
95-
deprecationNotice " Please use >>/opt/docker/bin/proviation add --tag entrypoint --priority 200 [role]<< for adding provision roles"
95+
deprecationNotice " Please use >>/opt/docker/bin/provision add --tag entrypoint --priority 200 [role]<< for adding provision roles"
9696
/opt/docker/bin/provision add --tag entrypoint --priority 200 "$1"
9797
;;
9898

‎docker/base/alpine-3/conf/bin/provision.sh

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

33
#
44
# Example:
@@ -13,7 +13,7 @@ set -o errexit ## set -e : exit the script if any statement returns a non-true
1313

1414
. config.sh
1515

16-
deprecationNotice " Please use >>/opt/docker/bin/proviation run --playbook playbook.yml --tag=bootstrap [args]<< for running provision"
16+
deprecationNotice " Please use >>/opt/docker/bin/provision run --playbook playbook.yml --tag=bootstrap [args]<< for running provision"
1717

1818

1919
if [ "$#" -lt 2 ]; then

‎docker/base/centos-7/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ FROM webdevops/bootstrap:centos-7
88
MAINTAINER [email protected]
99
LABEL vendor=WebDevOps.io
1010
LABEL io.webdevops.layout=7
11-
LABEL io.webdevops.version=0.50.0
11+
LABEL io.webdevops.version=0.50.2
1212

1313
ENV DOCKER_CONF_HOME /opt/docker/
1414

0 commit comments

Comments
 (0)