Skip to content
This repository was archived by the owner on Jan 6, 2018. It is now read-only.

Commit e50595c

Browse files
viljasteviljaste
committed
Update
1 parent ddf46d5 commit e50595c

File tree

3 files changed

+108
-32
lines changed

3 files changed

+108
-32
lines changed

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Generates general purpose [docker-compose.yml](https://docs.docker.com/compose/y
1616
TMP="$(mktemp -d)" \
1717
&& git clone https://github.com/dockerizedrupal/drupal-compose.git "${TMP}" \
1818
&& cd "${TMP}" \
19-
&& git checkout 1.0.7 \
19+
&& git checkout 1.0.8 \
2020
&& sudo cp "${TMP}/drupal-compose.sh" /usr/local/bin/drupal-compose \
2121
&& sudo chmod +x /usr/local/bin/drupal-compose \
2222
&& cd -

‎VERSION.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
1.0.8

‎drupal-compose.sh‎

Lines changed: 106 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env bash
22

3-
VERSION="1.0.7"
3+
VERSION="1.0.8"
44

55
WORKING_DIR="$(pwd)"
66

@@ -75,7 +75,7 @@ apache:
7575
extends:
7676
file: host.yml
7777
service: apache
78-
image: dockerizedrupal/apache-2.4:1.0.6
78+
image: dockerizedrupal/apache-2.4:1.0.9
7979
hostname: apache
8080
ports:
8181
- "80"
@@ -87,26 +87,40 @@ apache:
8787
environment:
8888
- VHOST_PROJECT_NAME=${PROJECT_NAME}
8989
- VHOST_SERVICE_NAME=apache
90+
- VHOST_PRIMARY_SERVICE=Yes
91+
- VHOST_VERSION_FILE=https://raw.githubusercontent.com/dockerizedrupal/docker-apache-2.4/master/VERSION.md
9092
apache-data:
91-
image: dockerizedrupal/data:1.0.2
93+
image: dockerizedrupal/data:1.0.3
9294
hostname: apache-data
9395
volumes:
9496
- .:/apache/data
97+
environment:
98+
- VHOST_PROJECT_NAME=${PROJECT_NAME}
99+
- VHOST_SERVICE_NAME=apache-data
100+
- VHOST_VERSION_FILE=https://raw.githubusercontent.com/dockerizedrupal/docker-data/master/VERSION.md
95101
mysql:
96-
image: dockerizedrupal/mysql:1.0.3
102+
image: dockerizedrupal/mysql:1.0.4
97103
hostname: mysql
98104
volumes_from:
99105
- mysql-data
106+
environment:
107+
- VHOST_PROJECT_NAME=${PROJECT_NAME}
108+
- VHOST_SERVICE_NAME=mysql
109+
- VHOST_VERSION_FILE=https://raw.githubusercontent.com/dockerizedrupal/docker-mysql/master/VERSION.md
100110
mysql-data:
101-
image: dockerizedrupal/data:1.0.2
111+
image: dockerizedrupal/data:1.0.3
102112
hostname: mysql-data
103113
volumes:
104114
- /mysql
115+
environment:
116+
- VHOST_PROJECT_NAME=${PROJECT_NAME}
117+
- VHOST_SERVICE_NAME=mysql-data
118+
- VHOST_VERSION_FILE=https://raw.githubusercontent.com/dockerizedrupal/docker-data/master/VERSION.md
105119
php:
106120
extends:
107121
file: host.yml
108122
service: php
109-
image: dockerizedrupal/php-5.5:1.0.4
123+
image: dockerizedrupal/php-5.5:1.0.5
110124
hostname: php
111125
volumes:
112126
- ~/.ssh:/home/container/.ssh
@@ -118,17 +132,21 @@ php:
118132
- memcached
119133
environment:
120134
- DRUPAL_VERSION=6
135+
- VHOST_PROJECT_NAME=${PROJECT_NAME}
136+
- VHOST_SERVICE_NAME=php
137+
- VHOST_VERSION_FILE=https://raw.githubusercontent.com/dockerizedrupal/docker-php-5.5/master/VERSION.md
121138
mailcatcher:
122-
image: dockerizedrupal/mailcatcher:1.0.1
139+
image: dockerizedrupal/mailcatcher:1.0.2
123140
hostname: mailcatcher
124141
ports:
125142
- "80"
126143
- "443"
127144
environment:
128145
- VHOST_PROJECT_NAME=${PROJECT_NAME}
129146
- VHOST_SERVICE_NAME=mailcatcher
147+
- VHOST_VERSION_FILE=https://raw.githubusercontent.com/dockerizedrupal/docker-mailcatcher/master/VERSION.md
130148
phpmyadmin:
131-
image: dockerizedrupal/phpmyadmin:1.0.2
149+
image: dockerizedrupal/phpmyadmin:1.0.3
132150
hostname: phpmyadmin
133151
ports:
134152
- "80"
@@ -138,8 +156,9 @@ phpmyadmin:
138156
environment:
139157
- VHOST_PROJECT_NAME=${PROJECT_NAME}
140158
- VHOST_SERVICE_NAME=phpmyadmin
159+
- VHOST_VERSION_FILE=https://raw.githubusercontent.com/dockerizedrupal/docker-phpmyadmin/master/VERSION.md
141160
adminer:
142-
image: dockerizedrupal/adminer:1.0.2
161+
image: dockerizedrupal/adminer:1.0.4
143162
hostname: adminer
144163
ports:
145164
- "80"
@@ -149,11 +168,16 @@ adminer:
149168
environment:
150169
- VHOST_PROJECT_NAME=${PROJECT_NAME}
151170
- VHOST_SERVICE_NAME=adminer
171+
- VHOST_VERSION_FILE=https://raw.githubusercontent.com/dockerizedrupal/docker-adminer/master/VERSION.md
152172
memcached:
153-
image: dockerizedrupal/memcached:1.0.1
173+
image: dockerizedrupal/memcached:1.0.2
154174
hostname: memcached
175+
environment:
176+
- VHOST_PROJECT_NAME=${PROJECT_NAME}
177+
- VHOST_SERVICE_NAME=memcached
178+
- VHOST_VERSION_FILE=https://raw.githubusercontent.com/dockerizedrupal/docker-memcached/master/VERSION.md
155179
memcachephp:
156-
image: dockerizedrupal/memcachephp:1.0.1
180+
image: dockerizedrupal/memcachephp:1.0.2
157181
hostname: memcachephp
158182
ports:
159183
- "80"
@@ -163,6 +187,7 @@ memcachephp:
163187
environment:
164188
- VHOST_PROJECT_NAME=${PROJECT_NAME}
165189
- VHOST_SERVICE_NAME=memcachedphp
190+
- VHOST_VERSION_FILE=https://raw.githubusercontent.com/dockerizedrupal/docker-memcachephp/master/VERSION.md
166191
EOF
167192
}
168193

@@ -193,7 +218,7 @@ apache:
193218
extends:
194219
file: host.yml
195220
service: apache
196-
image: dockerizedrupal/apache-2.4:1.0.6
221+
image: dockerizedrupal/apache-2.4:1.0.9
197222
hostname: apache
198223
ports:
199224
- "80"
@@ -205,26 +230,40 @@ apache:
205230
environment:
206231
- VHOST_PROJECT_NAME=${PROJECT_NAME}
207232
- VHOST_SERVICE_NAME=apache
233+
- VHOST_PRIMARY_SERVICE=Yes
234+
- VHOST_VERSION_FILE=https://raw.githubusercontent.com/dockerizedrupal/docker-apache-2.4/master/VERSION.md
208235
apache-data:
209-
image: dockerizedrupal/data:1.0.2
236+
image: dockerizedrupal/data:1.0.3
210237
hostname: apache-data
211238
volumes:
212239
- .:/apache/data
240+
environment:
241+
- VHOST_PROJECT_NAME=${PROJECT_NAME}
242+
- VHOST_SERVICE_NAME=apache-data
243+
- VHOST_VERSION_FILE=https://raw.githubusercontent.com/dockerizedrupal/docker-data/master/VERSION.md
213244
mysql:
214-
image: dockerizedrupal/mysql:1.0.3
245+
image: dockerizedrupal/mysql:1.0.4
215246
hostname: mysql
216247
volumes_from:
217248
- mysql-data
249+
environment:
250+
- VHOST_PROJECT_NAME=${PROJECT_NAME}
251+
- VHOST_SERVICE_NAME=mysql
252+
- VHOST_VERSION_FILE=https://raw.githubusercontent.com/dockerizedrupal/docker-mysql/master/VERSION.md
218253
mysql-data:
219-
image: dockerizedrupal/data:1.0.2
254+
image: dockerizedrupal/data:1.0.3
220255
hostname: mysql-data
221256
volumes:
222257
- /mysql
258+
environment:
259+
- VHOST_PROJECT_NAME=${PROJECT_NAME}
260+
- VHOST_SERVICE_NAME=mysql-data
261+
- VHOST_VERSION_FILE=https://raw.githubusercontent.com/dockerizedrupal/docker-data/master/VERSION.md
223262
php:
224263
extends:
225264
file: host.yml
226265
service: php
227-
image: dockerizedrupal/php-5.3:1.0.5
266+
image: dockerizedrupal/php-5.3:1.0.6
228267
hostname: php
229268
volumes:
230269
- ~/.ssh:/home/container/.ssh
@@ -236,17 +275,21 @@ php:
236275
- memcached
237276
environment:
238277
- DRUPAL_VERSION=7
278+
- VHOST_PROJECT_NAME=${PROJECT_NAME}
279+
- VHOST_SERVICE_NAME=php
280+
- VHOST_VERSION_FILE=https://raw.githubusercontent.com/dockerizedrupal/docker-php-5.3/master/VERSION.md
239281
mailcatcher:
240-
image: dockerizedrupal/mailcatcher:1.0.1
282+
image: dockerizedrupal/mailcatcher:1.0.2
241283
hostname: mailcatcher
242284
ports:
243285
- "80"
244286
- "443"
245287
environment:
246288
- VHOST_PROJECT_NAME=${PROJECT_NAME}
247289
- VHOST_SERVICE_NAME=mailcatcher
290+
- VHOST_VERSION_FILE=https://raw.githubusercontent.com/dockerizedrupal/docker-mailcatcher/master/VERSION.md
248291
phpmyadmin:
249-
image: dockerizedrupal/phpmyadmin:1.0.2
292+
image: dockerizedrupal/phpmyadmin:1.0.3
250293
hostname: phpmyadmin
251294
ports:
252295
- "80"
@@ -256,8 +299,9 @@ phpmyadmin:
256299
environment:
257300
- VHOST_PROJECT_NAME=${PROJECT_NAME}
258301
- VHOST_SERVICE_NAME=phpmyadmin
302+
- VHOST_VERSION_FILE=https://raw.githubusercontent.com/dockerizedrupal/docker-phpmyadmin/master/VERSION.md
259303
adminer:
260-
image: dockerizedrupal/adminer:1.0.2
304+
image: dockerizedrupal/adminer:1.0.4
261305
hostname: adminer
262306
ports:
263307
- "80"
@@ -267,11 +311,16 @@ adminer:
267311
environment:
268312
- VHOST_PROJECT_NAME=${PROJECT_NAME}
269313
- VHOST_SERVICE_NAME=adminer
314+
- VHOST_VERSION_FILE=https://raw.githubusercontent.com/dockerizedrupal/docker-adminer/master/VERSION.md
270315
memcached:
271-
image: dockerizedrupal/memcached:1.0.1
316+
image: dockerizedrupal/memcached:1.0.2
272317
hostname: memcached
318+
environment:
319+
- VHOST_PROJECT_NAME=${PROJECT_NAME}
320+
- VHOST_SERVICE_NAME=memcached
321+
- VHOST_VERSION_FILE=https://raw.githubusercontent.com/dockerizedrupal/docker-memcached/master/VERSION.md
273322
memcachephp:
274-
image: dockerizedrupal/memcachephp:1.0.1
323+
image: dockerizedrupal/memcachephp:1.0.2
275324
hostname: memcachephp
276325
ports:
277326
- "80"
@@ -281,6 +330,7 @@ memcachephp:
281330
environment:
282331
- VHOST_PROJECT_NAME=${PROJECT_NAME}
283332
- VHOST_SERVICE_NAME=memcachephp
333+
- VHOST_VERSION_FILE=https://raw.githubusercontent.com/dockerizedrupal/docker-memcachephp/master/VERSION.md
284334
EOF
285335
}
286336

@@ -311,7 +361,7 @@ apache:
311361
extends:
312362
file: host.yml
313363
service: apache
314-
image: dockerizedrupal/apache-2.2:1.0.3
364+
image: dockerizedrupal/apache-2.2:1.0.5
315365
hostname: apache
316366
ports:
317367
- "80"
@@ -323,26 +373,40 @@ apache:
323373
environment:
324374
- VHOST_PROJECT_NAME=${PROJECT_NAME}
325375
- VHOST_SERVICE_NAME=apache
376+
- VHOST_PRIMARY_SERVICE=Yes
377+
- VHOST_VERSION_FILE=https://raw.githubusercontent.com/dockerizedrupal/docker-apache-2.2/master/VERSION.md
326378
apache-data:
327-
image: dockerizedrupal/data:1.0.2
379+
image: dockerizedrupal/data:1.0.3
328380
hostname: apache-data
329381
volumes:
330382
- .:/apache/data
383+
environment:
384+
- VHOST_PROJECT_NAME=${PROJECT_NAME}
385+
- VHOST_SERVICE_NAME=apache-data
386+
- VHOST_VERSION_FILE=https://raw.githubusercontent.com/dockerizedrupal/docker-data/master/VERSION.md
331387
mysql:
332-
image: dockerizedrupal/mysql:1.0.3
388+
image: dockerizedrupal/mysql:1.0.4
333389
hostname: mysql
334390
volumes_from:
335391
- mysql-data
392+
environment:
393+
- VHOST_PROJECT_NAME=${PROJECT_NAME}
394+
- VHOST_SERVICE_NAME=mysql
395+
- VHOST_VERSION_FILE=https://raw.githubusercontent.com/dockerizedrupal/docker-mysql/master/VERSION.md
336396
mysql-data:
337-
image: dockerizedrupal/data:1.0.2
397+
image: dockerizedrupal/data:1.0.3
338398
hostname: mysql-data
339399
volumes:
340400
- /mysql
401+
environment:
402+
- VHOST_PROJECT_NAME=${PROJECT_NAME}
403+
- VHOST_SERVICE_NAME=mysql-data
404+
- VHOST_VERSION_FILE=https://raw.githubusercontent.com/dockerizedrupal/docker-data/master/VERSION.md
341405
php:
342406
extends:
343407
file: host.yml
344408
service: php
345-
image: dockerizedrupal/php-5.2:1.0.2
409+
image: dockerizedrupal/php-5.2:1.0.3
346410
hostname: php
347411
volumes:
348412
- ~/.ssh:/home/container/.ssh
@@ -354,17 +418,21 @@ php:
354418
- memcached
355419
environment:
356420
- DRUPAL_VERSION=6
421+
- VHOST_PROJECT_NAME=${PROJECT_NAME}
422+
- VHOST_SERVICE_NAME=php
423+
- VHOST_VERSION_FILE=https://raw.githubusercontent.com/dockerizedrupal/docker-php-5.2/master/VERSION.md
357424
mailcatcher:
358-
image: dockerizedrupal/mailcatcher:1.0.1
425+
image: dockerizedrupal/mailcatcher:1.0.2
359426
hostname: mailcatcher
360427
ports:
361428
- "80"
362429
- "443"
363430
environment:
364431
- VHOST_PROJECT_NAME=${PROJECT_NAME}
365432
- VHOST_SERVICE_NAME=mailcatcher
433+
- VHOST_VERSION_FILE=https://raw.githubusercontent.com/dockerizedrupal/docker-mailcatcher/master/VERSION.md
366434
phpmyadmin:
367-
image: dockerizedrupal/phpmyadmin:1.0.2
435+
image: dockerizedrupal/phpmyadmin:1.0.3
368436
hostname: phpmyadmin
369437
ports:
370438
- "80"
@@ -374,8 +442,9 @@ phpmyadmin:
374442
environment:
375443
- VHOST_PROJECT_NAME=${PROJECT_NAME}
376444
- VHOST_SERVICE_NAME=phpmyadmin
445+
- VHOST_VERSION_FILE=https://raw.githubusercontent.com/dockerizedrupal/docker-phpmyadmin/master/VERSION.md
377446
adminer:
378-
image: dockerizedrupal/adminer:1.0.2
447+
image: dockerizedrupal/adminer:1.0.4
379448
hostname: adminer
380449
ports:
381450
- "80"
@@ -385,11 +454,16 @@ adminer:
385454
environment:
386455
- VHOST_PROJECT_NAME=${PROJECT_NAME}
387456
- VHOST_SERVICE_NAME=adminer
457+
- VHOST_VERSION_FILE=https://raw.githubusercontent.com/dockerizedrupal/docker-adminer/master/VERSION.md
388458
memcached:
389-
image: dockerizedrupal/memcached:1.0.1
459+
image: dockerizedrupal/memcached:1.0.2
390460
hostname: memcached
461+
environment:
462+
- VHOST_PROJECT_NAME=${PROJECT_NAME}
463+
- VHOST_SERVICE_NAME=memcached
464+
- VHOST_VERSION_FILE=https://raw.githubusercontent.com/dockerizedrupal/docker-memcached/master/VERSION.md
391465
memcachephp:
392-
image: dockerizedrupal/memcachephp:1.0.1
466+
image: dockerizedrupal/memcachephp:1.0.2
393467
hostname: memcachephp
394468
ports:
395469
- "80"
@@ -399,6 +473,7 @@ memcachephp:
399473
environment:
400474
- VHOST_PROJECT_NAME=${PROJECT_NAME}
401475
- VHOST_SERVICE_NAME=memcachephp
476+
- VHOST_VERSION_FILE=https://raw.githubusercontent.com/dockerizedrupal/docker-memcachephp/master/VERSION.md
402477
EOF
403478
}
404479

0 commit comments

Comments
 (0)