Skip to content

Commit 4bcf93e

Browse files
mblaschkemblaschke
committed
Merge branch 'feature/refactoring' into feature/cloud-support
2 parents 101f328 + bbc6b00 commit 4bcf93e

File tree

132 files changed

+925
-2543
lines changed

Some content is hidden

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

132 files changed

+925
-2543
lines changed

‎.dockerignore‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
*.md
2+
.git*
3+
/backup/
4+
/bin/
5+
/documentation/
6+
/docker/
7+
/code/

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@ nbproject
44
/backup/*
55
/code/*
66
/docker/sourcecode/code/*
7+
/docker-compose.yml

‎CHANGELOG.md‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,15 @@
11
PHP Docker Boilerplate Changelog
22
==================================
33

4-
4.1.0 - UPCOMING
4+
5.0.0 - UPCOMING
5+
----------------
6+
- Refactored with new `webdevops/base` images
7+
- Faster creation/startup times
8+
- Ansible provisioning
9+
- Real production and development provisioning
10+
- Added cloud support (without host mounted volumes)
11+
12+
4.1.0 - canceled
513
------------------
614
- Added cron
715
- Improved documentation

‎Dockerfile-Source‎

Lines changed: 0 additions & 24 deletions
This file was deleted.

‎Dockerfile.cloud‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
#++++++++++++++++++++++++++++++++++++++
2+
# Application Docker container
3+
#++++++++++++++++++++++++++++++++++++++
4+
#
5+
# PHP-Versions:
6+
# ubuntu-12.04 -> PHP 5.3, LTS (precise)
7+
# ubuntu-14.04 -> PHP 5.5, LTS (trusty)
8+
# ubuntu-15.04 -> PHP 5.6 (vivid)
9+
# ubuntu-15.10 -> PHP 5.6 (wily)
10+
# centos-7 -> PHP 5.4
11+
#
12+
# Apache:
13+
# webdevops/php-apache:ubuntu-12.04
14+
# webdevops/php-apache:ubuntu-14.04
15+
# webdevops/php-apache:ubuntu-15.04
16+
# webdevops/php-apache:ubuntu-15.10
17+
# webdevops/php-apache:centos-7
18+
#
19+
# Nginx:
20+
# webdevops/php-nginx:ubuntu-12.04
21+
# webdevops/php-nginx:ubuntu-14.04
22+
# webdevops/php-nginx:ubuntu-15.04
23+
# webdevops/php-nginx:ubuntu-15.10
24+
# webdevops/php-nginx:centos-7
25+
#
26+
# HHVM:
27+
# webdevops/hhvm-apache
28+
# webdevops/hhvm-nginx
29+
#
30+
#++++++++++++++++++++++++++++++++++++++
31+
32+
FROM webdevops/php-apache:ubuntu-14.04
33+
34+
ENV PROVISION_CONTEXT "production"
35+
36+
# Deploy scripts/configurations
37+
COPY etc/ /opt/docker/etc/
38+
COPY provision/ /opt/docker/provision/
39+
40+
COPY code/ /application/code/
41+
42+
RUN /opt/docker/bin/control.sh provision.role.startup boilerplate-main \
43+
&& /opt/docker/bin/control.sh provision.role.startup boilerplate-deployment \
44+
&& /opt/docker/bin/control.sh service.enable cron \
45+
&& /opt/docker/bin/control.sh service.enable dnsmasq \
46+
&& /opt/docker/bin/bootstrap.sh
47+
48+
# Configure volume/workdir
49+
RUN mkdir -p /application/code/
50+
VOLUME /application/
51+
WORKDIR /application/code/

‎Dockerfile.development‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
#++++++++++++++++++++++++++++++++++++++
2+
# Application Docker container
3+
#++++++++++++++++++++++++++++++++++++++
4+
#
5+
# PHP-Versions:
6+
# ubuntu-12.04 -> PHP 5.3, LTS (precise)
7+
# ubuntu-14.04 -> PHP 5.5, LTS (trusty)
8+
# ubuntu-15.04 -> PHP 5.6 (vivid)
9+
# ubuntu-15.10 -> PHP 5.6 (wily)
10+
# centos-7 -> PHP 5.4
11+
#
12+
# Apache:
13+
# webdevops/php-apache:ubuntu-12.04
14+
# webdevops/php-apache:ubuntu-14.04
15+
# webdevops/php-apache:ubuntu-15.04
16+
# webdevops/php-apache:ubuntu-15.10
17+
# webdevops/php-apache:centos-7
18+
#
19+
# Nginx:
20+
# webdevops/php-nginx:ubuntu-12.04
21+
# webdevops/php-nginx:ubuntu-14.04
22+
# webdevops/php-nginx:ubuntu-15.04
23+
# webdevops/php-nginx:ubuntu-15.10
24+
# webdevops/php-nginx:centos-7
25+
#
26+
# HHVM:
27+
# webdevops/hhvm-apache
28+
# webdevops/hhvm-nginx
29+
#
30+
#++++++++++++++++++++++++++++++++++++++
31+
32+
FROM webdevops/php-apache:ubuntu-14.04
33+
34+
ENV PROVISION_CONTEXT "development"
35+
36+
# Deploy scripts/configurations
37+
COPY etc/ /opt/docker/etc/
38+
COPY provision/ /opt/docker/provision/
39+
40+
RUN /opt/docker/bin/control.sh provision.role boilerplate-main \
41+
&& /opt/docker/bin/control.sh provision.role boilerplate-main-development \
42+
&& /opt/docker/bin/control.sh provision.role.startup boilerplate-deployment \
43+
&& /opt/docker/bin/control.sh service.enable cron \
44+
&& /opt/docker/bin/control.sh service.enable dnsmasq \
45+
&& /opt/docker/bin/control.sh service.enable postfix \
46+
&& /opt/docker/bin/bootstrap.sh
47+
48+
# Configure volume/workdir
49+
RUN mkdir -p /application/code/
50+
WORKDIR /application/code/

‎Dockerfile.production‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
#++++++++++++++++++++++++++++++++++++++
2+
# Application Docker container
3+
#++++++++++++++++++++++++++++++++++++++
4+
#
5+
# PHP-Versions:
6+
# ubuntu-12.04 -> PHP 5.3, LTS (precise)
7+
# ubuntu-14.04 -> PHP 5.5, LTS (trusty)
8+
# ubuntu-15.04 -> PHP 5.6 (vivid)
9+
# ubuntu-15.10 -> PHP 5.6 (wily)
10+
# centos-7 -> PHP 5.4
11+
#
12+
# Apache:
13+
# webdevops/php-apache:ubuntu-12.04
14+
# webdevops/php-apache:ubuntu-14.04
15+
# webdevops/php-apache:ubuntu-15.04
16+
# webdevops/php-apache:ubuntu-15.10
17+
# webdevops/php-apache:centos-7
18+
#
19+
# Nginx:
20+
# webdevops/php-nginx:ubuntu-12.04
21+
# webdevops/php-nginx:ubuntu-14.04
22+
# webdevops/php-nginx:ubuntu-15.04
23+
# webdevops/php-nginx:ubuntu-15.10
24+
# webdevops/php-nginx:centos-7
25+
#
26+
# HHVM:
27+
# webdevops/hhvm-apache
28+
# webdevops/hhvm-nginx
29+
#
30+
#++++++++++++++++++++++++++++++++++++++
31+
32+
33+
34+
FROM webdevops/php-apache:ubuntu-14.04
35+
FROM webdevops/php-apache:ubuntu-14.04
36+
FROM webdevops/php-apache:ubuntu-14.04
37+
FROM webdevops/php-apache:ubuntu-14.04
38+
39+
ENV PROVISION_CONTEXT "production"
40+
41+
# Deploy scripts/configurations
42+
COPY etc/ /opt/docker/etc/
43+
COPY provision/ /opt/docker/provision/
44+
45+
RUN /opt/docker/bin/control.sh provision.role boilerplate-main \
46+
&& /opt/docker/bin/control.sh provision.role.startup boilerplate-deployment \
47+
&& /opt/docker/bin/control.sh service.enable cron \
48+
&& /opt/docker/bin/control.sh service.enable dnsmasq \
49+
&& /opt/docker/bin/control.sh service.enable postfix \
50+
&& /opt/docker/bin/bootstrap.sh
51+
52+
# Configure volume/workdir
53+
RUN mkdir -p /application/code/
54+
WORKDIR /application/code/

‎LICENSE‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
The MIT License (MIT)
22

3+
Copyright (c) 2015 WebDevOps
34
Copyright (c) 2015 Markus Blaschke
45

56
Permission is hereby granted, free of charge, to any person obtaining a copy

‎docker-compose-cloud.yml‎ renamed to ‎docker-compose.cloud.yml‎

Lines changed: 24 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,8 @@
22
# Main php container
33
#######################################
44
main:
5-
build: docker/main
6-
#dockerfile: Ubuntu-12.04 # Ubuntu 12.04 - PHP 5.3, LTS (precise)
7-
dockerfile: Ubuntu-14.04 # Ubuntu 14.04 - PHP 5.5, LTS (trusty)
8-
#dockerfile: Ubuntu-15.04 # Ubuntu 15.04 - PHP 5.6 (vivid)
9-
#dockerfile: Ubuntu-15.10 # Ubuntu 15.10 - PHP 5.6 (wily)
10-
#dockerfile: Ubuntu-HHVM # Ubuntu 14.04 - HHVM (trusty)
11-
#dockerfile: Centos-7 # CentOS 7 - PHP 5.4
5+
build: .
6+
dockerfile: Dockerfile.cloud
127
links:
138
- mysql
149
#- postgres
@@ -19,30 +14,15 @@ main:
1914
#- memcached
2015
#- ftp
2116
ports:
17+
- "8000:80"
18+
- "8443:443"
2219
- "10022:22"
2320
volumes_from:
2421
- sourcecode
2522
- storage
2623
env_file:
27-
- docker-env.yml
28-
29-
#######################################
30-
# Webserver
31-
#######################################
32-
web:
33-
build: docker/web
34-
dockerfile: Apache-Httpd # Apache HTTPd
35-
#dockerfile: Nginx # Nginx
36-
ports:
37-
- 8000:80
38-
- 8443:443
39-
links:
40-
- main
41-
volumes_from:
42-
- main
43-
- storage
44-
env_file:
45-
- docker-env.yml
24+
- docker-environment.yml
25+
- docker-environment.production.yml
4626

4727
#######################################
4828
# MySQL server
@@ -59,7 +39,8 @@ mysql:
5939
volumes_from:
6040
- storage
6141
env_file:
62-
- docker-env.yml
42+
- docker-environment.yml
43+
- docker-environment.production.yml
6344

6445
#######################################
6546
# PostgreSQL server
@@ -69,7 +50,8 @@ mysql:
6950
# volumes_from:
7051
# - storage
7152
# env_file:
72-
# - docker-env.yml
53+
# - docker-environment.yml
54+
# - docker-environment.production.yml
7355

7456
#######################################
7557
# Solr server
@@ -81,7 +63,8 @@ mysql:
8163
# environment:
8264
# - SOLR_STORAGE=/data/solr/server-master/
8365
# env_file:
84-
# - docker-env.yml
66+
# - docker-environment.yml
67+
# - docker-environment.production.yml
8568

8669
#######################################
8770
# Elasticsearch
@@ -91,7 +74,8 @@ mysql:
9174
# volumes_from:
9275
# - storage
9376
# env_file:
94-
# - docker-env.yml
77+
# - docker-environment.yml
78+
# - docker-environment.production.yml
9579

9680
#######################################
9781
# Redis
@@ -101,7 +85,8 @@ mysql:
10185
# volumes_from:
10286
# - storage
10387
# env_file:
104-
# - docker-env.yml
88+
# - docker-environment.yml
89+
# - docker-environment.production.yml
10590

10691
#######################################
10792
# Memcached
@@ -111,15 +96,17 @@ mysql:
11196
# volumes_from:
11297
# - storage
11398
# env_file:
114-
# - docker-env.yml
99+
# - docker-environment.yml
100+
# - docker-environment.production.yml
115101

116102
#######################################
117103
# Mailcatcher
118104
#######################################
119105
#mail:
120106
# build: docker/mail/
121107
# env_file:
122-
# - docker-env.yml
108+
# - docker-environment.yml
109+
# - docker-environment.production.yml
123110

124111
#######################################
125112
# FTP (vsftpd)
@@ -130,7 +117,8 @@ mysql:
130117
# - sourcecode
131118
# - storage
132119
# env_file:
133-
# - docker-env.yml
120+
# - docker-environment.yml
121+
# - docker-environment.production.yml
134122

135123
#######################################
136124
# sourcecode
@@ -141,7 +129,8 @@ sourcecode:
141129
volumes:
142130
- /docker/code/
143131
env_file:
144-
- docker-env.yml
132+
- docker-environment.yml
133+
- docker-environment.production.yml
145134

146135
#######################################
147136
# Storage

0 commit comments

Comments
 (0)