Skip to content

Commit 6452440

Browse files
mblaschkemblaschke
committed
Moved docker environment to etc/environment*.yml
1 parent db74b1d commit 6452440

10 files changed

+61
-61
lines changed

‎docker-compose.cloud.yml‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ main:
2121
- sourcecode
2222
- storage
2323
env_file:
24-
- docker-environment.yml
25-
- docker-environment.production.yml
24+
- etc/environment.yml
25+
- etc/environment.production.yml
2626

2727
#######################################
2828
# MySQL server
@@ -39,8 +39,8 @@ mysql:
3939
volumes_from:
4040
- storage
4141
env_file:
42-
- docker-environment.yml
43-
- docker-environment.production.yml
42+
- etc/environment.yml
43+
- etc/environment.production.yml
4444

4545
#######################################
4646
# PostgreSQL server
@@ -50,8 +50,8 @@ mysql:
5050
# volumes_from:
5151
# - storage
5252
# env_file:
53-
# - docker-environment.yml
54-
# - docker-environment.production.yml
53+
# - etc/environment.yml
54+
# - etc/environment.production.yml
5555

5656
#######################################
5757
# Solr server
@@ -63,8 +63,8 @@ mysql:
6363
# environment:
6464
# - SOLR_STORAGE=/data/solr/server-master/
6565
# env_file:
66-
# - docker-environment.yml
67-
# - docker-environment.production.yml
66+
# - etc/environment.yml
67+
# - etc/environment.production.yml
6868

6969
#######################################
7070
# Elasticsearch
@@ -74,8 +74,8 @@ mysql:
7474
# volumes_from:
7575
# - storage
7676
# env_file:
77-
# - docker-environment.yml
78-
# - docker-environment.production.yml
77+
# - etc/environment.yml
78+
# - etc/environment.production.yml
7979

8080
#######################################
8181
# Redis
@@ -85,8 +85,8 @@ mysql:
8585
# volumes_from:
8686
# - storage
8787
# env_file:
88-
# - docker-environment.yml
89-
# - docker-environment.production.yml
88+
# - etc/environment.yml
89+
# - etc/environment.production.yml
9090

9191
#######################################
9292
# Memcached
@@ -96,17 +96,17 @@ mysql:
9696
# volumes_from:
9797
# - storage
9898
# env_file:
99-
# - docker-environment.yml
100-
# - docker-environment.production.yml
99+
# - etc/environment.yml
100+
# - etc/environment.production.yml
101101

102102
#######################################
103103
# Mailcatcher
104104
#######################################
105105
#mail:
106106
# build: docker/mail/
107107
# env_file:
108-
# - docker-environment.yml
109-
# - docker-environment.production.yml
108+
# - etc/environment.yml
109+
# - etc/environment.production.yml
110110

111111
#######################################
112112
# FTP (vsftpd)
@@ -117,8 +117,8 @@ mysql:
117117
# - sourcecode
118118
# - storage
119119
# env_file:
120-
# - docker-environment.yml
121-
# - docker-environment.production.yml
120+
# - etc/environment.yml
121+
# - etc/environment.production.yml
122122

123123
#######################################
124124
# sourcecode
@@ -129,8 +129,8 @@ sourcecode:
129129
volumes:
130130
- /docker/code/
131131
env_file:
132-
- docker-environment.yml
133-
- docker-environment.production.yml
132+
- etc/environment.yml
133+
- etc/environment.production.yml
134134

135135
#######################################
136136
# Storage

‎docker-compose.development.yml‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ main:
2727
- SYS_PTRACE
2828
privileged: true
2929
env_file:
30-
- docker-environment.yml
31-
- docker-environment.development.yml
30+
- etc/environment.yml
31+
- etc/environment.development.yml
3232

3333
#######################################
3434
# MySQL server
@@ -49,8 +49,8 @@ mysql:
4949
volumes:
5050
- /tmp/debug/:/tmp/debug/
5151
env_file:
52-
- docker-environment.yml
53-
- docker-environment.development.yml
52+
- etc/environment.yml
53+
- etc/environment.development.yml
5454

5555
#######################################
5656
# PostgreSQL server
@@ -62,8 +62,8 @@ mysql:
6262
# volumes_from:
6363
# - storage
6464
# env_file:
65-
# - docker-environment.yml
66-
# - docker-environment.development.yml
65+
# - etc/environment.yml
66+
# - etc/environment.development.yml
6767

6868
#######################################
6969
# Solr server
@@ -77,8 +77,8 @@ mysql:
7777
# environment:
7878
# - SOLR_STORAGE=/data/solr/server-master/
7979
# env_file:
80-
# - docker-environment.yml
81-
# - docker-environment.development.yml
80+
# - etc/environment.yml
81+
# - etc/environment.development.yml
8282

8383
#######################################
8484
# Elasticsearch
@@ -91,8 +91,8 @@ mysql:
9191
# volumes_from:
9292
# - storage
9393
# env_file:
94-
# - docker-environment.yml
95-
# - docker-environment.development.yml
94+
# - etc/environment.yml
95+
# - etc/environment.development.yml
9696

9797
#######################################
9898
# Redis
@@ -102,8 +102,8 @@ mysql:
102102
# volumes_from:
103103
# - storage
104104
# env_file:
105-
# - docker-environment.yml
106-
# - docker-environment.development.yml
105+
# - etc/environment.yml
106+
# - etc/environment.development.yml
107107

108108
#######################################
109109
# Memcached
@@ -113,8 +113,8 @@ mysql:
113113
# volumes_from:
114114
# - storage
115115
# env_file:
116-
# - docker-environment.yml
117-
# - docker-environment.development.yml
116+
# - etc/environment.yml
117+
# - etc/environment.development.yml
118118

119119
#######################################
120120
# Mailcatcher
@@ -124,8 +124,8 @@ mysql:
124124
# ports:
125125
# - 1080:1080
126126
# env_file:
127-
# - docker-environment.yml
128-
# - docker-environment.development.yml
127+
# - etc/environment.yml
128+
# - etc/environment.development.yml
129129

130130
#######################################
131131
# FTP (vsftpd)
@@ -138,8 +138,8 @@ mysql:
138138
# - ./:/docker/
139139
# - /tmp/debug/:/tmp/debug/
140140
# env_file:
141-
# - docker-environment.yml
142-
# - docker-environment.development.yml
141+
# - etc/environment.yml
142+
# - etc/environment.development.yml
143143

144144
#######################################
145145
# Storage

‎docker-compose.production.yml‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ main:
2222
volumes_from:
2323
- storage
2424
env_file:
25-
- docker-environment.yml
26-
- docker-environment.production.yml
25+
- etc/environment.yml
26+
- etc/environment.production.yml
2727

2828
#######################################
2929
# MySQL server
@@ -42,8 +42,8 @@ mysql:
4242
volumes:
4343
- /tmp/debug/:/tmp/debug/
4444
env_file:
45-
- docker-environment.yml
46-
- docker-environment.production.yml
45+
- etc/environment.yml
46+
- etc/environment.production.yml
4747

4848
#######################################
4949
# PostgreSQL server
@@ -55,8 +55,8 @@ mysql:
5555
# volumes_from:
5656
# - storage
5757
# env_file:
58-
# - docker-environment.yml
59-
# - docker-environment.production.yml
58+
# - etc/environment.yml
59+
# - etc/environment.production.yml
6060

6161
#######################################
6262
# Solr server
@@ -70,8 +70,8 @@ mysql:
7070
# environment:
7171
# - SOLR_STORAGE=/data/solr/server-master/
7272
# env_file:
73-
# - docker-environment.yml
74-
# - docker-environment.production.yml
73+
# - etc/environment.yml
74+
# - etc/environment.production.yml
7575

7676
#######################################
7777
# Elasticsearch
@@ -84,8 +84,8 @@ mysql:
8484
# volumes_from:
8585
# - storage
8686
# env_file:
87-
# - docker-environment.yml
88-
# - docker-environment.production.yml
87+
# - etc/environment.yml
88+
# - etc/environment.production.yml
8989

9090
#######################################
9191
# Redis
@@ -95,8 +95,8 @@ mysql:
9595
# volumes_from:
9696
# - storage
9797
# env_file:
98-
# - docker-environment.yml
99-
# - docker-environment.production.yml
98+
# - etc/environment.yml
99+
# - etc/environment.production.yml
100100

101101
#######################################
102102
# Memcached
@@ -106,8 +106,8 @@ mysql:
106106
# volumes_from:
107107
# - storage
108108
# env_file:
109-
# - docker-environment.yml
110-
# - docker-environment.production.yml
109+
# - etc/environment.yml
110+
# - etc/environment.production.yml
111111

112112
#######################################
113113
# Mailcatcher
@@ -117,8 +117,8 @@ mysql:
117117
# ports:
118118
# - 1080:1080
119119
# env_file:
120-
# - docker-environment.yml
121-
# - docker-environment.production.yml
120+
# - etc/environment.yml
121+
# - etc/environment.production.yml
122122

123123
#######################################
124124
# FTP (vsftpd)
@@ -131,8 +131,8 @@ mysql:
131131
# - ./:/docker/
132132
# - /tmp/debug/:/tmp/debug/
133133
# env_file:
134-
# - docker-environment.yml
135-
# - docker-environment.production.yml
134+
# - etc/environment.yml
135+
# - etc/environment.production.yml
136136

137137
#######################################
138138
# Storage

‎documentation/DOCKER-QUICKSTART.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ docker-compose logs main
5858
docker-compose logs main mysql
5959
```
6060

61-
CLI script (defined in docker-env.yml)
61+
CLI script (defined in etc/environment*.yml)
6262

6363
```bash
6464
docker-compose run --rm main cli help
65-
```
65+
```

‎documentation/PROJECT-EXISTING.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ or manually
1515
git clone --recursive https://github..../ code/
1616
```
1717

18-
Check `DOCUMENT_ROOT` and `DOCUMENT_INDEX` in `docker-environment.yml`
18+
Check `DOCUMENT_ROOT` and `DOCUMENT_INDEX` in `etc/environment*.yml`
1919

2020
## Cli runner
2121

‎documentation/PROJECT-OTHER.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
## Create project
66

77
- Put your project files into `code/`
8-
- If needed modify `DOCUMENT_ROOT` and `DOCUMENT_INDEX` in `docker-env.yml`
8+
- If needed modify `DOCUMENT_ROOT` and `DOCUMENT_INDEX` in `etc/environment*.yml`
99
- You're done - really
1010

1111
## Cli runner

‎documentation/PROJECT-SYMFONY.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
make create symfony
99
```
1010

11-
And change `DOCUMENT_ROOT` and `DOCUMENT_ROOT` in `docker-environment.yml`:
11+
And change `DOCUMENT_ROOT` and `DOCUMENT_ROOT` in `etc/environment*.yml`:
1212

1313
DOCUMENT_ROOT=code/web/
1414
DOCUMENT_INDEX=app_dev.php

‎docker-environment.development.yml‎ renamed to ‎etc/environment.development.yml‎

File renamed without changes.

‎docker-environment.production.yml‎ renamed to ‎etc/environment.production.yml‎

File renamed without changes.

‎docker-environment.yml‎ renamed to ‎etc/environment.yml‎

File renamed without changes.

0 commit comments

Comments
 (0)