Skip to content

Commit 0d72c31

Browse files
mblaschkemblaschke
committed
Merge branch 'release/0.53.0'
2 parents 0d36061 + f8f393c commit 0d72c31

File tree

907 files changed

+1462
-2100
lines changed

Some content is hidden

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

907 files changed

+1462
-2100
lines changed

‎CHANGELOG.md

+9

‎Makefile

+10-3
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,9 @@ DOCKER_TAG_LATEST=`cat DOCKER_TAG_LATEST`
88
list:
99
sh -c "echo; $(MAKE) -p no_targets__ | awk -F':' '/^[a-zA-Z0-9][^\$$#\\t=]*:([^=]|$$)/ {split(\$$1,A,/ /);for(i in A)print A[i]}' | grep -v '__\$$' | grep -v 'Makefile'| sort"
1010

11-
all: provision bootstrap base web php php-dev hhvm service misc applications
12-
build: all
11+
full: provision build
12+
all: build
13+
build: bootstrap base web php php-dev hhvm service misc applications
1314

1415
bootstrap: webdevops/bootstrap webdevops/ansible
1516
base: webdevops/base webdevops/base-app webdevops/storage
@@ -19,7 +20,7 @@ php: webdevops/php webdevops/php-apache webdevops/php-nginx
1920
php-dev: webdevops/php-dev webdevops/php-apache-dev webdevops/php-nginx-dev
2021
hhvm: webdevops/hhvm webdevops/hhvm-apache webdevops/hhvm-nginx
2122

22-
web: webdevops/apache webdevops/nginx webdevops/varnish
23+
web: webdevops/apache webdevops/apache-dev webdevops/nginx webdevops/nginx-dev webdevops/varnish
2324

2425
applications: webdevops/typo3 webdevops/piwik
2526

@@ -99,9 +100,15 @@ webdevops/php-dev:
99100
webdevops/apache:
100101
bash bin/build.sh apache "${DOCKER_REPOSITORY}/apache" "${DOCKER_TAG_LATEST}"
101102

103+
webdevops/apache-dev:
104+
bash bin/build.sh apache-dev "${DOCKER_REPOSITORY}/apache-dev" "${DOCKER_TAG_LATEST}"
105+
102106
webdevops/nginx:
103107
bash bin/build.sh nginx "${DOCKER_REPOSITORY}/nginx" "${DOCKER_TAG_LATEST}"
104108

109+
webdevops/nginx-dev:
110+
bash bin/build.sh nginx-dev "${DOCKER_REPOSITORY}/nginx-dev" "${DOCKER_TAG_LATEST}"
111+
105112
webdevops/php-apache:
106113
bash bin/build.sh php-apache "${DOCKER_REPOSITORY}/php-apache" "${DOCKER_TAG_LATEST}"
107114

‎README.md

+3-2

‎baselayout/usr/local/bin/apk-install

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ set -o errexit ## set -e : exit the script if any statement returns a non-true
77
apk update
88

99
# Install packages
10-
apk add --upgrade --force $*
10+
apk add --upgrade $*
1111

1212
# Clear files (reduce snapshot size)
1313
rm -rf var/cache/apk/*

‎bin/provision.sh

+16
Original file line numberDiff line numberDiff line change
@@ -254,6 +254,13 @@ function header() {
254254
deployConfiguration apache/alpine apache 'alpine-*'
255255
}
256256

257+
## Build apache-dev
258+
[[ $(checkBuildTarget apache-dev) ]] && {
259+
header "apache-dev"
260+
clearConfiguration apache-dev '*'
261+
deployConfiguration apache-dev/general apache-dev '*'
262+
}
263+
257264
## Build nginx
258265
[[ $(checkBuildTarget nginx) ]] && {
259266
header "nginx"
@@ -263,6 +270,13 @@ function header() {
263270
deployConfiguration nginx/alpine nginx 'alpine-*'
264271
}
265272

273+
## Build nginx-dev
274+
[[ $(checkBuildTarget nginx) ]] && {
275+
header "nginx-dev"
276+
clearConfiguration nginx-dev '*'
277+
deployConfiguration nginx-dev/general nginx-dev '*'
278+
}
279+
266280
## Build hhvm
267281
[[ $(checkBuildTarget hhvm) ]] && {
268282
header "hhvm"
@@ -338,6 +352,7 @@ function header() {
338352
deployConfiguration apache/alpine php-apache-dev 'alpine-*'
339353
deployConfiguration php-apache/general php-apache-dev '*'
340354
deployConfiguration php-dev/general php-apache-dev '*'
355+
deployConfiguration apache-dev/general php-apache-dev '*'
341356
}
342357

343358
## Build php-nginx-dev
@@ -349,6 +364,7 @@ function header() {
349364
deployConfiguration nginx/alpine php-nginx-dev 'alpine-*'
350365
deployConfiguration php-nginx/general php-nginx-dev '*'
351366
deployConfiguration php-dev/general php-nginx-dev '*'
367+
deployConfiguration nginx-dev/general php-nginx-dev '*'
352368
}
353369

354370
## Build postfix

‎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=8
11-
LABEL io.webdevops.version=0.52.0
11+
LABEL io.webdevops.version=0.53.0

‎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=8
11-
LABEL io.webdevops.version=0.52.0
11+
LABEL io.webdevops.version=0.53.0

‎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=8
11-
LABEL io.webdevops.version=0.52.0
11+
LABEL io.webdevops.version=0.53.0

‎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=8
11-
LABEL io.webdevops.version=0.52.0
11+
LABEL io.webdevops.version=0.53.0

‎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=8
11-
LABEL io.webdevops.version=0.52.0
11+
LABEL io.webdevops.version=0.53.0

‎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=8
11-
LABEL io.webdevops.version=0.52.0
11+
LABEL io.webdevops.version=0.53.0

‎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=8
11-
LABEL io.webdevops.version=0.52.0
11+
LABEL io.webdevops.version=0.53.0

‎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=8
11-
LABEL io.webdevops.version=0.52.0
11+
LABEL io.webdevops.version=0.53.0

‎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=8
11-
LABEL io.webdevops.version=0.52.0
11+
LABEL io.webdevops.version=0.53.0

‎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=8
11-
LABEL io.webdevops.version=0.52.0
11+
LABEL io.webdevops.version=0.53.0

‎docker/apache-dev/README.md

+44

‎docker/apache-dev/alpine-3/Dockerfile

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
#+++++++++++++++++++++++++++++++++++++++
2+
# Dockerfile for webdevops/apache-dev:alpine-3
3+
# -- automatically generated --
4+
#+++++++++++++++++++++++++++++++++++++++
5+
6+
FROM webdevops/apache:alpine-3
7+
8+
MAINTAINER [email protected]
9+
LABEL vendor=WebDevOps.io
10+
LABEL io.webdevops.layout=8
11+
LABEL io.webdevops.version=0.53.0
12+
13+
ENV WEB_DOCUMENT_ROOT /app
14+
ENV WEB_DOCUMENT_INDEX index.php
15+
ENV WEB_ALIAS_DOMAIN *.vm
16+
17+
COPY conf/ /opt/docker/
18+
19+
# Install apache
20+
RUN echo \
21+
&& /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache-dev \
22+
&& /opt/docker/bin/bootstrap.sh
23+
24+
25+
EXPOSE 80 443

‎docker/apache-dev/alpine-3/Dockerfile.jinja2

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{{ docker.from("apache", "alpine-3") }}
2+
3+
{{ docker.version() }}
4+
5+
{{ environment.web() }}
6+
7+
{{ docker.copy('conf/', '/opt/docker/') }}
8+
9+
{{ apachedev.general() }}
10+
11+
{{ docker.expose('80 443') }}

‎docker/php-dev/alpine-3-php7/conf/bin/service.d/httpd.d/12-development.sh renamed to ‎docker/apache-dev/alpine-3/conf/bin/service.d/httpd.d/12-development.sh

File renamed without changes.

‎docker/php-dev/alpine-3-php7/conf/etc/httpd/conf.d/02-dev.conf renamed to ‎docker/apache-dev/alpine-3/conf/etc/httpd/conf.d/02-dev.conf

File renamed without changes.

‎docker/php-apache-dev/alpine-3-php7/conf/etc/nginx/vhost.common.d/.gitkeep renamed to ‎docker/apache-dev/alpine-3/conf/etc/httpd/vhost.common.d/.gitkeep

File renamed without changes.

‎docker/php-dev/alpine-3-php7/conf/etc/httpd/vhost.common.d/02-dev.conf renamed to ‎docker/apache-dev/alpine-3/conf/etc/httpd/vhost.common.d/02-dev.conf

File renamed without changes.

‎docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml renamed to ‎docker/apache-dev/alpine-3/conf/provision/roles/webdevops-apache-dev/defaults/main.yml

File renamed without changes.

‎docker/apache-dev/alpine-3/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
---
2+

‎docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml renamed to ‎docker/apache-dev/alpine-3/conf/provision/roles/webdevops-apache-dev/tasks/main.yml

File renamed without changes.

‎docker/apache-dev/centos-7/Dockerfile

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
#+++++++++++++++++++++++++++++++++++++++
2+
# Dockerfile for webdevops/apache-dev:centos-7
3+
# -- automatically generated --
4+
#+++++++++++++++++++++++++++++++++++++++
5+
6+
FROM webdevops/apache:centos-7
7+
8+
MAINTAINER [email protected]
9+
LABEL vendor=WebDevOps.io
10+
LABEL io.webdevops.layout=8
11+
LABEL io.webdevops.version=0.53.0
12+
13+
ENV WEB_DOCUMENT_ROOT /app
14+
ENV WEB_DOCUMENT_INDEX index.php
15+
ENV WEB_ALIAS_DOMAIN *.vm
16+
17+
COPY conf/ /opt/docker/
18+
19+
# Install apache
20+
RUN echo \
21+
&& /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache-dev \
22+
&& /opt/docker/bin/bootstrap.sh
23+
24+
25+
EXPOSE 80 443

‎docker/apache-dev/centos-7/Dockerfile.jinja2

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{{ docker.from("apache", "centos-7") }}
2+
3+
{{ docker.version() }}
4+
5+
{{ environment.web() }}
6+
7+
{{ docker.copy('conf/', '/opt/docker/') }}
8+
9+
{{ apachedev.general() }}
10+
11+
{{ docker.expose('80 443') }}

‎docker/php-dev/alpine-3/conf/bin/service.d/httpd.d/12-development.sh renamed to ‎docker/apache-dev/centos-7/conf/bin/service.d/httpd.d/12-development.sh

File renamed without changes.

‎docker/php-dev/alpine-3/conf/etc/httpd/conf.d/02-dev.conf renamed to ‎docker/apache-dev/centos-7/conf/etc/httpd/conf.d/02-dev.conf

File renamed without changes.

‎docker/php-apache-dev/alpine-3/conf/etc/nginx/vhost.common.d/.gitkeep renamed to ‎docker/apache-dev/centos-7/conf/etc/httpd/vhost.common.d/.gitkeep

File renamed without changes.

‎docker/php-dev/alpine-3/conf/etc/httpd/vhost.common.d/02-dev.conf renamed to ‎docker/apache-dev/centos-7/conf/etc/httpd/vhost.common.d/02-dev.conf

File renamed without changes.

‎docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml renamed to ‎docker/apache-dev/centos-7/conf/provision/roles/webdevops-apache-dev/defaults/main.yml

File renamed without changes.

‎docker/apache-dev/centos-7/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
---
2+

‎docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml renamed to ‎docker/apache-dev/centos-7/conf/provision/roles/webdevops-apache-dev/tasks/main.yml

File renamed without changes.

‎docker/apache-dev/debian-7/Dockerfile

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
#+++++++++++++++++++++++++++++++++++++++
2+
# Dockerfile for webdevops/apache-dev:debian-7
3+
# -- automatically generated --
4+
#+++++++++++++++++++++++++++++++++++++++
5+
6+
FROM webdevops/apache:debian-7
7+
8+
MAINTAINER [email protected]
9+
LABEL vendor=WebDevOps.io
10+
LABEL io.webdevops.layout=8
11+
LABEL io.webdevops.version=0.53.0
12+
13+
ENV WEB_DOCUMENT_ROOT /app
14+
ENV WEB_DOCUMENT_INDEX index.php
15+
ENV WEB_ALIAS_DOMAIN *.vm
16+
17+
COPY conf/ /opt/docker/
18+
19+
# Install apache
20+
RUN echo \
21+
&& /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache-dev \
22+
&& /opt/docker/bin/bootstrap.sh
23+
24+
25+
EXPOSE 80 443

‎docker/apache-dev/debian-7/Dockerfile.jinja2

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{{ docker.from("apache", "debian-7") }}
2+
3+
{{ docker.version() }}
4+
5+
{{ environment.web() }}
6+
7+
{{ docker.copy('conf/', '/opt/docker/') }}
8+
9+
{{ apachedev.general() }}
10+
11+
{{ docker.expose('80 443') }}

‎docker/php-dev/centos-7-php56/conf/bin/service.d/httpd.d/12-development.sh renamed to ‎docker/apache-dev/debian-7/conf/bin/service.d/httpd.d/12-development.sh

File renamed without changes.

‎docker/php-dev/centos-7-php56/conf/etc/httpd/conf.d/02-dev.conf renamed to ‎docker/apache-dev/debian-7/conf/etc/httpd/conf.d/02-dev.conf

File renamed without changes.

‎docker/php-apache-dev/centos-7-php56/conf/etc/nginx/vhost.common.d/.gitkeep renamed to ‎docker/apache-dev/debian-7/conf/etc/httpd/vhost.common.d/.gitkeep

File renamed without changes.

‎docker/php-dev/centos-7-php56/conf/etc/httpd/vhost.common.d/02-dev.conf renamed to ‎docker/apache-dev/debian-7/conf/etc/httpd/vhost.common.d/02-dev.conf

File renamed without changes.

‎docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml renamed to ‎docker/apache-dev/debian-7/conf/provision/roles/webdevops-apache-dev/defaults/main.yml

File renamed without changes.

‎docker/apache-dev/debian-7/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
---
2+

‎docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml renamed to ‎docker/apache-dev/debian-7/conf/provision/roles/webdevops-apache-dev/tasks/main.yml

File renamed without changes.

‎docker/apache-dev/debian-8/Dockerfile

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
#+++++++++++++++++++++++++++++++++++++++
2+
# Dockerfile for webdevops/apache-dev:debian-8
3+
# -- automatically generated --
4+
#+++++++++++++++++++++++++++++++++++++++
5+
6+
FROM webdevops/apache:debian-8
7+
8+
MAINTAINER [email protected]
9+
LABEL vendor=WebDevOps.io
10+
LABEL io.webdevops.layout=8
11+
LABEL io.webdevops.version=0.53.0
12+
13+
ENV WEB_DOCUMENT_ROOT /app
14+
ENV WEB_DOCUMENT_INDEX index.php
15+
ENV WEB_ALIAS_DOMAIN *.vm
16+
17+
COPY conf/ /opt/docker/
18+
19+
# Install apache
20+
RUN echo \
21+
&& /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache-dev \
22+
&& /opt/docker/bin/bootstrap.sh
23+
24+
25+
EXPOSE 80 443

‎docker/apache-dev/debian-8/Dockerfile.jinja2

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{{ docker.from("apache", "debian-8") }}
2+
3+
{{ docker.version() }}
4+
5+
{{ environment.web() }}
6+
7+
{{ docker.copy('conf/', '/opt/docker/') }}
8+
9+
{{ apachedev.general() }}
10+
11+
{{ docker.expose('80 443') }}

‎docker/php-dev/centos-7/conf/bin/service.d/httpd.d/12-development.sh renamed to ‎docker/apache-dev/debian-8/conf/bin/service.d/httpd.d/12-development.sh

File renamed without changes.

‎docker/php-dev/centos-7/conf/etc/httpd/conf.d/02-dev.conf renamed to ‎docker/apache-dev/debian-8/conf/etc/httpd/conf.d/02-dev.conf

File renamed without changes.

‎docker/php-apache-dev/centos-7/conf/etc/nginx/vhost.common.d/.gitkeep renamed to ‎docker/apache-dev/debian-8/conf/etc/httpd/vhost.common.d/.gitkeep

File renamed without changes.

‎docker/php-dev/centos-7/conf/etc/httpd/vhost.common.d/02-dev.conf renamed to ‎docker/apache-dev/debian-8/conf/etc/httpd/vhost.common.d/02-dev.conf

File renamed without changes.

‎docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml renamed to ‎docker/apache-dev/debian-8/conf/provision/roles/webdevops-apache-dev/defaults/main.yml

File renamed without changes.

‎docker/apache-dev/debian-8/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
---
2+

‎docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml renamed to ‎docker/apache-dev/debian-8/conf/provision/roles/webdevops-apache-dev/tasks/main.yml

File renamed without changes.

0 commit comments

Comments
 (0)