Skip to content

Commit d5f3501

Browse files
mblaschkemblaschke
committed
Moved to /application/
1 parent abaeb34 commit d5f3501

6 files changed

+106
-14
lines changed

Diff for: ‎Dockerfile.cloud

+33-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,33 @@
11
#++++++++++++++++++++++++++++++++++++++
22
# Application Docker container
33
#++++++++++++++++++++++++++++++++++++++
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+
#++++++++++++++++++++++++++++++++++++++
431

532
FROM webdevops/php-apache:ubuntu-14.04
633

@@ -10,10 +37,15 @@ ENV PROVISION_CONTEXT "production"
1037
COPY etc/ /opt/docker/etc/
1138
COPY provision/ /opt/docker/provision/
1239

13-
COPY code/ /docker/code/
40+
COPY code/ /application/code/
1441

1542
RUN /opt/docker/bin/control.sh provision.role.startup boilerplate-main \
1643
&& /opt/docker/bin/control.sh provision.role.startup boilerplate-deployment \
1744
&& /opt/docker/bin/control.sh service.enable cron \
1845
&& /opt/docker/bin/control.sh service.enable dnsmasq \
1946
&& /opt/docker/bin/bootstrap.sh
47+
48+
# Configure volume/workdir
49+
RUN mkdir -p /application/code/
50+
VOLUME /application/
51+
WORKDIR /application/code/

Diff for: ‎Dockerfile.development

+32
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,33 @@
11
#++++++++++++++++++++++++++++++++++++++
22
# Application Docker container
33
#++++++++++++++++++++++++++++++++++++++
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+
#++++++++++++++++++++++++++++++++++++++
431

532
FROM webdevops/php-apache:ubuntu-14.04
633

@@ -15,4 +42,9 @@ RUN /opt/docker/bin/control.sh provision.role boilerplate-main \
1542
&& /opt/docker/bin/control.sh provision.role.startup boilerplate-deployment \
1643
&& /opt/docker/bin/control.sh service.enable cron \
1744
&& /opt/docker/bin/control.sh service.enable dnsmasq \
45+
&& /opt/docker/bin/control.sh service.enable postfix \
1846
&& /opt/docker/bin/bootstrap.sh
47+
48+
# Configure volume/workdir
49+
RUN mkdir -p /application/code/
50+
WORKDIR /application/code/

Diff for: ‎Dockerfile.production

+37
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,39 @@
11
#++++++++++++++++++++++++++++++++++++++
22
# Application Docker container
33
#++++++++++++++++++++++++++++++++++++++
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+
432

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
537
FROM webdevops/php-apache:ubuntu-14.04
638

739
ENV PROVISION_CONTEXT "production"
@@ -14,4 +46,9 @@ RUN /opt/docker/bin/control.sh provision.role boilerplate-main \
1446
&& /opt/docker/bin/control.sh provision.role.startup boilerplate-deployment \
1547
&& /opt/docker/bin/control.sh service.enable cron \
1648
&& /opt/docker/bin/control.sh service.enable dnsmasq \
49+
&& /opt/docker/bin/control.sh service.enable postfix \
1750
&& /opt/docker/bin/bootstrap.sh
51+
52+
# Configure volume/workdir
53+
RUN mkdir -p /application/code/
54+
WORKDIR /application/code/

Diff for: ‎docker-compose.development.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ main:
1818
- "8443:443"
1919
- "10022:22"
2020
volumes:
21-
- ./:/docker/
21+
- ./:/application/
2222
- /tmp/debug/:/tmp/debug/
2323
volumes_from:
2424
- storage

Diff for: ‎docker-compose.production.yml

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

Diff for: ‎docker-environment.yml

+2-11
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
# Webserver
1111

1212
# General
13-
WEB_DOCUMENT_ROOT=/docker/code/
13+
WEB_DOCUMENT_ROOT=/application/code/
1414
WEB_DOCUMENT_INDEX=index.php
15-
CLI_SCRIPT=php /docker/code/index.php
15+
CLI_SCRIPT=php /application/code/index.php
1616

1717
#######################################
1818
# SSH settings
@@ -22,15 +22,6 @@ CLI_SCRIPT=php /docker/code/index.php
2222
# -> https://github.com/USERNAME.keys
2323
SSH_AUTH_KEY=""
2424

25-
#######################################
26-
# Mail
27-
28-
# Vagrant mail sandbox
29-
MAIL_GATEWAY=192.168.56.2
30-
31-
# Mailcatcher (container)
32-
#MAIL_GATEWAY=mail:1025
33-
3425
#######################################
3526
# MySQL settings
3627
# -> if you change these settings

0 commit comments

Comments
 (0)