Skip to content

Commit 45cb077

Browse files
mblaschkemblaschke
committed
Refactored docker environment variables (development/production context)
1 parent 22be8fe commit 45cb077

6 files changed

+102
-45
lines changed

‎docker-compose-cloud.yml ‎docker-compose.cloud.yml

+20-10
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ main:
2121
- sourcecode
2222
- storage
2323
env_file:
24-
- docker-env.yml
24+
- docker-environment.yml
25+
- docker-environment.production.yml
2526

2627
#######################################
2728
# MySQL server
@@ -38,7 +39,8 @@ mysql:
3839
volumes_from:
3940
- storage
4041
env_file:
41-
- docker-env.yml
42+
- docker-environment.yml
43+
- docker-environment.production.yml
4244

4345
#######################################
4446
# PostgreSQL server
@@ -48,7 +50,8 @@ mysql:
4850
# volumes_from:
4951
# - storage
5052
# env_file:
51-
# - docker-env.yml
53+
# - docker-environment.yml
54+
# - docker-environment.production.yml
5255

5356
#######################################
5457
# Solr server
@@ -60,7 +63,8 @@ mysql:
6063
# environment:
6164
# - SOLR_STORAGE=/data/solr/server-master/
6265
# env_file:
63-
# - docker-env.yml
66+
# - docker-environment.yml
67+
# - docker-environment.production.yml
6468

6569
#######################################
6670
# Elasticsearch
@@ -70,7 +74,8 @@ mysql:
7074
# volumes_from:
7175
# - storage
7276
# env_file:
73-
# - docker-env.yml
77+
# - docker-environment.yml
78+
# - docker-environment.production.yml
7479

7580
#######################################
7681
# Redis
@@ -80,7 +85,8 @@ mysql:
8085
# volumes_from:
8186
# - storage
8287
# env_file:
83-
# - docker-env.yml
88+
# - docker-environment.yml
89+
# - docker-environment.production.yml
8490

8591
#######################################
8692
# Memcached
@@ -90,15 +96,17 @@ mysql:
9096
# volumes_from:
9197
# - storage
9298
# env_file:
93-
# - docker-env.yml
99+
# - docker-environment.yml
100+
# - docker-environment.production.yml
94101

95102
#######################################
96103
# Mailcatcher
97104
#######################################
98105
#mail:
99106
# build: docker/mail/
100107
# env_file:
101-
# - docker-env.yml
108+
# - docker-environment.yml
109+
# - docker-environment.production.yml
102110

103111
#######################################
104112
# FTP (vsftpd)
@@ -109,7 +117,8 @@ mysql:
109117
# - sourcecode
110118
# - storage
111119
# env_file:
112-
# - docker-env.yml
120+
# - docker-environment.yml
121+
# - docker-environment.production.yml
113122

114123
#######################################
115124
# sourcecode
@@ -120,7 +129,8 @@ sourcecode:
120129
volumes:
121130
- /docker/code/
122131
env_file:
123-
- docker-env.yml
132+
- docker-environment.yml
133+
- docker-environment.production.yml
124134

125135
#######################################
126136
# Storage

‎docker-compose-development.yml ‎docker-compose.development.yml

+18-9
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ main:
2727
- SYS_PTRACE
2828
privileged: true
2929
env_file:
30-
- docker-env.yml
30+
- docker-environment.yml
31+
- docker-environment.development.yml
3132

3233
#######################################
3334
# MySQL server
@@ -48,7 +49,8 @@ mysql:
4849
volumes:
4950
- /tmp/debug/:/tmp/debug/
5051
env_file:
51-
- docker-env.yml
52+
- docker-environment.yml
53+
- docker-environment.development.yml
5254

5355
#######################################
5456
# PostgreSQL server
@@ -60,7 +62,8 @@ mysql:
6062
# volumes_from:
6163
# - storage
6264
# env_file:
63-
# - docker-env.yml
65+
# - docker-environment.yml
66+
# - docker-environment.development.yml
6467

6568
#######################################
6669
# Solr server
@@ -74,7 +77,8 @@ mysql:
7477
# environment:
7578
# - SOLR_STORAGE=/data/solr/server-master/
7679
# env_file:
77-
# - docker-env.yml
80+
# - docker-environment.yml
81+
# - docker-environment.development.yml
7882

7983
#######################################
8084
# Elasticsearch
@@ -87,7 +91,8 @@ mysql:
8791
# volumes_from:
8892
# - storage
8993
# env_file:
90-
# - docker-env.yml
94+
# - docker-environment.yml
95+
# - docker-environment.development.yml
9196

9297
#######################################
9398
# Redis
@@ -97,7 +102,8 @@ mysql:
97102
# volumes_from:
98103
# - storage
99104
# env_file:
100-
# - docker-env.yml
105+
# - docker-environment.yml
106+
# - docker-environment.development.yml
101107

102108
#######################################
103109
# Memcached
@@ -107,7 +113,8 @@ mysql:
107113
# volumes_from:
108114
# - storage
109115
# env_file:
110-
# - docker-env.yml
116+
# - docker-environment.yml
117+
# - docker-environment.development.yml
111118

112119
#######################################
113120
# Mailcatcher
@@ -117,7 +124,8 @@ mysql:
117124
# ports:
118125
# - 1080:1080
119126
# env_file:
120-
# - docker-env.yml
127+
# - docker-environment.yml
128+
# - docker-environment.development.yml
121129

122130
#######################################
123131
# FTP (vsftpd)
@@ -130,7 +138,8 @@ mysql:
130138
# - ./:/docker/
131139
# - /tmp/debug/:/tmp/debug/
132140
# env_file:
133-
# - docker-env.yml
141+
# - docker-environment.yml
142+
# - docker-environment.development.yml
134143

135144
#######################################
136145
# Storage

‎docker-compose-production.yml ‎docker-compose.production.yml

+18-9
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@ main:
2222
volumes_from:
2323
- storage
2424
env_file:
25-
- docker-env.yml
25+
- docker-environment.yml
26+
- docker-environment.production.yml
2627

2728
#######################################
2829
# MySQL server
@@ -43,7 +44,8 @@ mysql:
4344
volumes:
4445
- /tmp/debug/:/tmp/debug/
4546
env_file:
46-
- docker-env.yml
47+
- docker-environment.yml
48+
- docker-environment.production.yml
4749

4850
#######################################
4951
# PostgreSQL server
@@ -55,7 +57,8 @@ mysql:
5557
# volumes_from:
5658
# - storage
5759
# env_file:
58-
# - docker-env.yml
60+
# - docker-environment.yml
61+
# - docker-environment.production.yml
5962

6063
#######################################
6164
# Solr server
@@ -69,7 +72,8 @@ mysql:
6972
# environment:
7073
# - SOLR_STORAGE=/data/solr/server-master/
7174
# env_file:
72-
# - docker-env.yml
75+
# - docker-environment.yml
76+
# - docker-environment.production.yml
7377

7478
#######################################
7579
# Elasticsearch
@@ -82,7 +86,8 @@ mysql:
8286
# volumes_from:
8387
# - storage
8488
# env_file:
85-
# - docker-env.yml
89+
# - docker-environment.yml
90+
# - docker-environment.production.yml
8691

8792
#######################################
8893
# Redis
@@ -92,7 +97,8 @@ mysql:
9297
# volumes_from:
9398
# - storage
9499
# env_file:
95-
# - docker-env.yml
100+
# - docker-environment.yml
101+
# - docker-environment.production.yml
96102

97103
#######################################
98104
# Memcached
@@ -102,7 +108,8 @@ mysql:
102108
# volumes_from:
103109
# - storage
104110
# env_file:
105-
# - docker-env.yml
111+
# - docker-environment.yml
112+
# - docker-environment.production.yml
106113

107114
#######################################
108115
# Mailcatcher
@@ -112,7 +119,8 @@ mysql:
112119
# ports:
113120
# - 1080:1080
114121
# env_file:
115-
# - docker-env.yml
122+
# - docker-environment.yml
123+
# - docker-environment.production.yml
116124

117125
#######################################
118126
# FTP (vsftpd)
@@ -125,7 +133,8 @@ mysql:
125133
# - ./:/docker/
126134
# - /tmp/debug/:/tmp/debug/
127135
# env_file:
128-
# - docker-env.yml
136+
# - docker-environment.yml
137+
# - docker-environment.production.yml
129138

130139
#######################################
131140
# Storage

‎docker-environment.development.yml

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
#######################################
2+
# Environment Configuration
3+
# - feel free to edit -
4+
# -> for most changes you only have to
5+
# docker-compose up -d
6+
# to apply them
7+
#######################################
8+
9+
#######################################
10+
# Context environment
11+
12+
# TYPO3
13+
TYPO3_CONTEXT=Development/Docker
14+
15+
# Symfony
16+
SYMFONY_ENV=dev
17+
SYMFONY_DEBUG=0
18+
19+
# CakePHP
20+
CAKE_ENV=dev
21+
22+
# yii
23+
YII_ENVIRONMENT=Development

‎docker-environment.production.yml

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
#######################################
2+
# Environment Configuration
3+
# - feel free to edit -
4+
# -> for most changes you only have to
5+
# docker-compose up -d
6+
# to apply them
7+
#######################################
8+
9+
#######################################
10+
# Context environment
11+
12+
# TYPO3
13+
TYPO3_CONTEXT=Production/Docker
14+
15+
# Symfony
16+
SYMFONY_ENV=prod
17+
SYMFONY_DEBUG=0
18+
19+
# CakePHP
20+
CAKE_ENV=prod
21+
22+
# yii
23+
YII_ENVIRONMENT=Production

‎docker-env.yml ‎docker-environment.yml

-17
Original file line numberDiff line numberDiff line change
@@ -14,23 +14,6 @@ WEB_DOCUMENT_ROOT=/docker/code/
1414
WEB_DOCUMENT_INDEX=index.php
1515
CLI_SCRIPT=php /docker/code/index.php
1616

17-
#######################################
18-
# Context environment
19-
20-
# TYPO3
21-
TYPO3_CONTEXT=Development/Docker
22-
23-
# Symfony
24-
SYMFONY_ENV=dev
25-
SYMFONY_DEBUG=0
26-
27-
# CakePHP
28-
CAKE_ENV=dev
29-
30-
# yii
31-
YII_ENVIRONMENT=Development
32-
33-
3417
#######################################
3518
# SSH settings
3619
# SSH public key (without comment):

0 commit comments

Comments
 (0)