Skip to content

Commit 302c511

Browse files
mblaschkemblaschke
committed
Moved code/ to app/
1 parent f358ecc commit 302c511

17 files changed

+79
-44
lines changed

‎CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ PHP Docker Boilerplate Changelog
88
- Ansible provisioning
99
- Real production and development provisioning
1010
- Added cloud support (without host mounted volumes)
11+
- Moved `code/` to `app/` (Moved `/application/code` to `/app` inside Docker container)
1112

1213
4.1.0 - canceled
1314
------------------

‎Dockerfile.cloud‎

Lines changed: 20 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,31 +3,43 @@
33
#++++++++++++++++++++++++++++++++++++++
44
#
55
# 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
6+
# ubuntu-12.04 -> PHP 5.3 (precise) LTS
7+
# ubuntu-14.04 -> PHP 5.5 (trusty) LTS
8+
# ubuntu-15.04 -> PHP 5.6 (vivid)
9+
# ubuntu-15.10 -> PHP 5.6 (wily)
10+
# ubuntu-16.04 -> PHP 5.6 and 7.0 (xenial) LTS
11+
# centos-7 -> PHP 5.4
12+
# debian-7 -> PHP 5.4 (wheezy)
13+
# debian-8 -> PHP 5.6 and 7.x (jessie)
14+
# debian-9 -> PHP 5.6 and 7.0 (stretch)
1115
#
1216
# Apache:
1317
# webdevops/php-apache:ubuntu-12.04
1418
# webdevops/php-apache:ubuntu-14.04
1519
# webdevops/php-apache:ubuntu-15.04
1620
# webdevops/php-apache:ubuntu-15.10
21+
# webdevops/php-apache:ubuntu-16.04
22+
# webdevops/php-apache:ubuntu-16.04-php7
1723
# webdevops/php-apache:centos-7
1824
# webdevops/php-apache:debian-7
1925
# webdevops/php-apache:debian-8
2026
# webdevops/php-apache:debian-8-php7
27+
# webdevops/php-apache:debian-9
28+
# webdevops/php-apache:debian-9-php7
2129
#
2230
# Nginx:
2331
# webdevops/php-nginx:ubuntu-12.04
2432
# webdevops/php-nginx:ubuntu-14.04
2533
# webdevops/php-nginx:ubuntu-15.04
2634
# webdevops/php-nginx:ubuntu-15.10
35+
# webdevops/php-nginx:ubuntu-16.04
36+
# webdevops/php-nginx:ubuntu-16.04-php7
2737
# webdevops/php-nginx:centos-7
2838
# webdevops/php-nginx:debian-7
2939
# webdevops/php-nginx:debian-8
3040
# webdevops/php-nginx:debian-8-php7
41+
# webdevops/php-nginx:debian-9
42+
# webdevops/php-nginx:debian-9-php7
3143
#
3244
# HHVM:
3345
# webdevops/hhvm-apache
@@ -43,13 +55,12 @@ ENV PROVISION_CONTEXT "production"
4355
COPY etc/ /opt/docker/etc/
4456
COPY provision/ /opt/docker/provision/
4557

46-
COPY code/ /application/code/
58+
COPY app/ /app/
4759

4860
RUN /opt/docker/bin/control.sh provision.role.startup boilerplate-main \
4961
&& /opt/docker/bin/control.sh provision.role.startup boilerplate-deployment \
5062
&& /opt/docker/bin/bootstrap.sh
5163

5264
# Configure volume/workdir
53-
RUN mkdir -p /application/code/
54-
VOLUME /application/
55-
WORKDIR /application/code/
65+
RUN mkdir -p /app/
66+
WORKDIR /app/

‎Dockerfile.development‎

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,31 +3,43 @@
33
#++++++++++++++++++++++++++++++++++++++
44
#
55
# 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
6+
# ubuntu-12.04 -> PHP 5.3 (precise) LTS
7+
# ubuntu-14.04 -> PHP 5.5 (trusty) LTS
8+
# ubuntu-15.04 -> PHP 5.6 (vivid)
9+
# ubuntu-15.10 -> PHP 5.6 (wily)
10+
# ubuntu-16.04 -> PHP 5.6 and 7.0 (xenial) LTS
11+
# centos-7 -> PHP 5.4
12+
# debian-7 -> PHP 5.4 (wheezy)
13+
# debian-8 -> PHP 5.6 and 7.x (jessie)
14+
# debian-9 -> PHP 5.6 and 7.0 (stretch)
1115
#
1216
# Apache:
1317
# webdevops/php-apache:ubuntu-12.04
1418
# webdevops/php-apache:ubuntu-14.04
1519
# webdevops/php-apache:ubuntu-15.04
1620
# webdevops/php-apache:ubuntu-15.10
21+
# webdevops/php-apache:ubuntu-16.04
22+
# webdevops/php-apache:ubuntu-16.04-php7
1723
# webdevops/php-apache:centos-7
1824
# webdevops/php-apache:debian-7
1925
# webdevops/php-apache:debian-8
2026
# webdevops/php-apache:debian-8-php7
27+
# webdevops/php-apache:debian-9
28+
# webdevops/php-apache:debian-9-php7
2129
#
2230
# Nginx:
2331
# webdevops/php-nginx:ubuntu-12.04
2432
# webdevops/php-nginx:ubuntu-14.04
2533
# webdevops/php-nginx:ubuntu-15.04
2634
# webdevops/php-nginx:ubuntu-15.10
35+
# webdevops/php-nginx:ubuntu-16.04
36+
# webdevops/php-nginx:ubuntu-16.04-php7
2737
# webdevops/php-nginx:centos-7
2838
# webdevops/php-nginx:debian-7
2939
# webdevops/php-nginx:debian-8
3040
# webdevops/php-nginx:debian-8-php7
41+
# webdevops/php-nginx:debian-9
42+
# webdevops/php-nginx:debian-9-php7
3143
#
3244
# HHVM:
3345
# webdevops/hhvm-apache
@@ -49,5 +61,5 @@ RUN /opt/docker/bin/control.sh provision.role boilerplate-main \
4961
&& /opt/docker/bin/bootstrap.sh
5062

5163
# Configure volume/workdir
52-
RUN mkdir -p /application/code/
53-
WORKDIR /application/code/
64+
RUN mkdir -p /app/
65+
WORKDIR /app/

‎Dockerfile.production‎

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,31 +3,43 @@
33
#++++++++++++++++++++++++++++++++++++++
44
#
55
# 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
6+
# ubuntu-12.04 -> PHP 5.3 (precise) LTS
7+
# ubuntu-14.04 -> PHP 5.5 (trusty) LTS
8+
# ubuntu-15.04 -> PHP 5.6 (vivid)
9+
# ubuntu-15.10 -> PHP 5.6 (wily)
10+
# ubuntu-16.04 -> PHP 5.6 and 7.0 (xenial) LTS
11+
# centos-7 -> PHP 5.4
12+
# debian-7 -> PHP 5.4 (wheezy)
13+
# debian-8 -> PHP 5.6 and 7.x (jessie)
14+
# debian-9 -> PHP 5.6 and 7.0 (stretch)
1115
#
1216
# Apache:
1317
# webdevops/php-apache:ubuntu-12.04
1418
# webdevops/php-apache:ubuntu-14.04
1519
# webdevops/php-apache:ubuntu-15.04
1620
# webdevops/php-apache:ubuntu-15.10
21+
# webdevops/php-apache:ubuntu-16.04
22+
# webdevops/php-apache:ubuntu-16.04-php7
1723
# webdevops/php-apache:centos-7
1824
# webdevops/php-apache:debian-7
1925
# webdevops/php-apache:debian-8
2026
# webdevops/php-apache:debian-8-php7
27+
# webdevops/php-apache:debian-9
28+
# webdevops/php-apache:debian-9-php7
2129
#
2230
# Nginx:
2331
# webdevops/php-nginx:ubuntu-12.04
2432
# webdevops/php-nginx:ubuntu-14.04
2533
# webdevops/php-nginx:ubuntu-15.04
2634
# webdevops/php-nginx:ubuntu-15.10
35+
# webdevops/php-nginx:ubuntu-16.04
36+
# webdevops/php-nginx:ubuntu-16.04-php7
2737
# webdevops/php-nginx:centos-7
2838
# webdevops/php-nginx:debian-7
2939
# webdevops/php-nginx:debian-8
3040
# webdevops/php-nginx:debian-8-php7
41+
# webdevops/php-nginx:debian-9
42+
# webdevops/php-nginx:debian-9-php7
3143
#
3244
# HHVM:
3345
# webdevops/hhvm-apache
@@ -48,5 +60,5 @@ RUN /opt/docker/bin/control.sh provision.role boilerplate-main \
4860
&& /opt/docker/bin/bootstrap.sh
4961

5062
# Configure volume/workdir
51-
RUN mkdir -p /application/code/
52-
WORKDIR /application/code/
63+
RUN mkdir -p /app/
64+
WORKDIR /app/

‎Makefile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,23 +37,23 @@ rebuild:
3737
#############################
3838

3939
mysql-backup:
40-
docker-compose run --rm --no-deps main root bash /application/bin/backup.sh mysql
40+
docker-compose run --rm --no-deps main root bash /docker/bin/backup.sh mysql
4141

4242
mysql-restore:
43-
docker-compose run --rm --no-deps main root bash /application/bin/restore.sh mysql
43+
docker-compose run --rm --no-deps main root bash /docker/bin/restore.sh mysql
4444

4545
#############################
4646
# Solr
4747
#############################
4848

4949
solr-backup:
5050
docker-compose stop solr
51-
docker-compose run --rm --no-deps main root bash /application/bin/backup.sh solr
51+
docker-compose run --rm --no-deps main root bash /docker/bin/backup.sh solr
5252
docker-compose start solr
5353

5454
solr-restore:
5555
docker-compose stop solr
56-
docker-compose run --rm --no-deps main root bash /application/bin/restore.sh solr
56+
docker-compose run --rm --no-deps main root bash /docker/bin/restore.sh solr
5757
docker-compose start solr
5858

5959
#############################

‎code/.gitkeep‎ renamed to ‎app/.gitkeep‎

File renamed without changes.

‎app/index.php‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<?php
2+
3+
phpinfo();

‎docker-compose.development.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,9 @@ main:
1818
- "8443:443"
1919
- "10022:22"
2020
volumes:
21-
- ./:/application/
21+
- ./app/:/app/
2222
- /tmp/debug/:/tmp/debug/
23+
- ./:/docker/
2324
volumes_from:
2425
- storage
2526
# cap and privileged needed for slowlog

‎docker-compose.production.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ main:
1818
- "8443:443"
1919
- "10022:22"
2020
volumes:
21-
- ./:/application/
21+
- ./app/:/app/
2222
volumes_from:
2323
- storage
2424
env_file:

‎documentation/DOCKER-INFO.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ Hostname | IP or Hostname of VM
9191
Port | 8000
9292
Debugger | Xdebug
9393
Use path mappings | Check
94-
Path mapping of folder 'code' | /docker/code/
94+
Path mapping of folder 'app' | /app/
9595

9696
### 2.) Add a debug connection (Run -> Edit Configurations... -> Connections) and create a new configuration (PHP Web Application).
9797

0 commit comments

Comments
 (0)