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

Commit d3754ad

Browse files
viljasteviljaste
committed
Update
1 parent 45a5dbc commit d3754ad

File tree

3 files changed

+30
-6
lines changed

3 files changed

+30
-6
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.9 \
19+
&& git checkout 1.0.10 \
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 & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.0.9
1+
1.0.10

‎drupal-compose.sh‎

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

3-
VERSION="1.0.9"
3+
VERSION="1.0.10"
44

55
WORKING_DIR="$(pwd)"
66

@@ -87,8 +87,9 @@ apache:
8787
environment:
8888
- VHOST_PROJECT_NAME=${PROJECT_NAME}
8989
- VHOST_SERVICE_NAME=apache
90+
- VHOST_SERVICE_VERSION=https://raw.githubusercontent.com/dockerizedrupal/docker-apache-2.4/master/VERSION.md
91+
- VHOST_SOURCE_URL=https://github.com/dockerizedrupal/docker-apache-2.2
9092
- VHOST_PRIMARY_SERVICE=Yes
91-
- VHOST_VERSION_FILE=https://raw.githubusercontent.com/dockerizedrupal/docker-apache-2.4/master/VERSION.md
9293
apache-data:
9394
image: dockerizedrupal/data:1.0.3
9495
hostname: apache-data
@@ -103,6 +104,7 @@ mysql:
103104
- VHOST_PROJECT_NAME=${PROJECT_NAME}
104105
- VHOST_SERVICE_NAME=mysql
105106
- VHOST_VERSION_FILE=https://raw.githubusercontent.com/dockerizedrupal/docker-mysql/master/VERSION.md
107+
- VHOST_SOURCE_URL=https://github.com/dockerizedrupal/docker-mysql
106108
mysql-data:
107109
image: dockerizedrupal/data:1.0.3
108110
hostname: mysql-data
@@ -127,6 +129,7 @@ php:
127129
- VHOST_PROJECT_NAME=${PROJECT_NAME}
128130
- VHOST_SERVICE_NAME=php
129131
- VHOST_VERSION_FILE=https://raw.githubusercontent.com/dockerizedrupal/docker-php-5.5/master/VERSION.md
132+
- VHOST_SOURCE_URL=https://github.com/dockerizedrupal/docker-php-5.5
130133
mailcatcher:
131134
image: dockerizedrupal/mailcatcher:1.0.2
132135
hostname: mailcatcher
@@ -137,6 +140,7 @@ mailcatcher:
137140
- VHOST_PROJECT_NAME=${PROJECT_NAME}
138141
- VHOST_SERVICE_NAME=mailcatcher
139142
- VHOST_VERSION_FILE=https://raw.githubusercontent.com/dockerizedrupal/docker-mailcatcher/master/VERSION.md
143+
- VHOST_SOURCE_URL=https://github.com/dockerizedrupal/docker-mailcatcher
140144
phpmyadmin:
141145
image: dockerizedrupal/phpmyadmin:1.0.3
142146
hostname: phpmyadmin
@@ -149,6 +153,7 @@ phpmyadmin:
149153
- VHOST_PROJECT_NAME=${PROJECT_NAME}
150154
- VHOST_SERVICE_NAME=phpmyadmin
151155
- VHOST_VERSION_FILE=https://raw.githubusercontent.com/dockerizedrupal/docker-phpmyadmin/master/VERSION.md
156+
- VHOST_SOURCE_URL=https://github.com/dockerizedrupal/docker-phpmyadmin
152157
adminer:
153158
image: dockerizedrupal/adminer:1.0.4
154159
hostname: adminer
@@ -161,13 +166,15 @@ adminer:
161166
- VHOST_PROJECT_NAME=${PROJECT_NAME}
162167
- VHOST_SERVICE_NAME=adminer
163168
- VHOST_VERSION_FILE=https://raw.githubusercontent.com/dockerizedrupal/docker-adminer/master/VERSION.md
169+
- VHOST_SOURCE_URL=https://github.com/dockerizedrupal/docker-adminer
164170
memcached:
165171
image: dockerizedrupal/memcached:1.0.2
166172
hostname: memcached
167173
environment:
168174
- VHOST_PROJECT_NAME=${PROJECT_NAME}
169175
- VHOST_SERVICE_NAME=memcached
170176
- VHOST_VERSION_FILE=https://raw.githubusercontent.com/dockerizedrupal/docker-memcached/master/VERSION.md
177+
- VHOST_SOURCE_URL=https://github.com/dockerizedrupal/docker-memcached
171178
memcachephp:
172179
image: dockerizedrupal/memcachephp:1.0.2
173180
hostname: memcachephp
@@ -180,6 +187,7 @@ memcachephp:
180187
- VHOST_PROJECT_NAME=${PROJECT_NAME}
181188
- VHOST_SERVICE_NAME=memcachedphp
182189
- VHOST_VERSION_FILE=https://raw.githubusercontent.com/dockerizedrupal/docker-memcachephp/master/VERSION.md
190+
- VHOST_SOURCE_URL=https://github.com/dockerizedrupal/docker-memcachephp
183191
EOF
184192
}
185193

@@ -222,8 +230,9 @@ apache:
222230
environment:
223231
- VHOST_PROJECT_NAME=${PROJECT_NAME}
224232
- VHOST_SERVICE_NAME=apache
225-
- VHOST_PRIMARY_SERVICE=Yes
226233
- VHOST_VERSION_FILE=https://raw.githubusercontent.com/dockerizedrupal/docker-apache-2.4/master/VERSION.md
234+
- VHOST_SOURCE_URL=https://github.com/dockerizedrupal/docker-apache-2.4
235+
- VHOST_PRIMARY_SERVICE=Yes
227236
apache-data:
228237
image: dockerizedrupal/data:1.0.3
229238
hostname: apache-data
@@ -238,6 +247,7 @@ mysql:
238247
- VHOST_PROJECT_NAME=${PROJECT_NAME}
239248
- VHOST_SERVICE_NAME=mysql
240249
- VHOST_VERSION_FILE=https://raw.githubusercontent.com/dockerizedrupal/docker-mysql/master/VERSION.md
250+
- VHOST_SOURCE_URL=https://github.com/dockerizedrupal/docker-mysql
241251
mysql-data:
242252
image: dockerizedrupal/data:1.0.3
243253
hostname: mysql-data
@@ -262,6 +272,7 @@ php:
262272
- VHOST_PROJECT_NAME=${PROJECT_NAME}
263273
- VHOST_SERVICE_NAME=php
264274
- VHOST_VERSION_FILE=https://raw.githubusercontent.com/dockerizedrupal/docker-php-5.3/master/VERSION.md
275+
- VHOST_SOURCE_URL=https://github.com/dockerizedrupal/docker-php-5.3
265276
mailcatcher:
266277
image: dockerizedrupal/mailcatcher:1.0.2
267278
hostname: mailcatcher
@@ -272,6 +283,7 @@ mailcatcher:
272283
- VHOST_PROJECT_NAME=${PROJECT_NAME}
273284
- VHOST_SERVICE_NAME=mailcatcher
274285
- VHOST_VERSION_FILE=https://raw.githubusercontent.com/dockerizedrupal/docker-mailcatcher/master/VERSION.md
286+
- VHOST_SOURCE_URL=https://github.com/dockerizedrupal/docker-mailcatcher
275287
phpmyadmin:
276288
image: dockerizedrupal/phpmyadmin:1.0.3
277289
hostname: phpmyadmin
@@ -284,6 +296,7 @@ phpmyadmin:
284296
- VHOST_PROJECT_NAME=${PROJECT_NAME}
285297
- VHOST_SERVICE_NAME=phpmyadmin
286298
- VHOST_VERSION_FILE=https://raw.githubusercontent.com/dockerizedrupal/docker-phpmyadmin/master/VERSION.md
299+
- VHOST_SOURCE_URL=https://github.com/dockerizedrupal/docker-phpmyadmin
287300
adminer:
288301
image: dockerizedrupal/adminer:1.0.4
289302
hostname: adminer
@@ -296,13 +309,15 @@ adminer:
296309
- VHOST_PROJECT_NAME=${PROJECT_NAME}
297310
- VHOST_SERVICE_NAME=adminer
298311
- VHOST_VERSION_FILE=https://raw.githubusercontent.com/dockerizedrupal/docker-adminer/master/VERSION.md
312+
- VHOST_SOURCE_URL=https://github.com/dockerizedrupal/docker-adminer
299313
memcached:
300314
image: dockerizedrupal/memcached:1.0.2
301315
hostname: memcached
302316
environment:
303317
- VHOST_PROJECT_NAME=${PROJECT_NAME}
304318
- VHOST_SERVICE_NAME=memcached
305319
- VHOST_VERSION_FILE=https://raw.githubusercontent.com/dockerizedrupal/docker-memcached/master/VERSION.md
320+
- VHOST_SOURCE_URL=https://github.com/dockerizedrupal/docker-memcached
306321
memcachephp:
307322
image: dockerizedrupal/memcachephp:1.0.2
308323
hostname: memcachephp
@@ -315,6 +330,7 @@ memcachephp:
315330
- VHOST_PROJECT_NAME=${PROJECT_NAME}
316331
- VHOST_SERVICE_NAME=memcachephp
317332
- VHOST_VERSION_FILE=https://raw.githubusercontent.com/dockerizedrupal/docker-memcachephp/master/VERSION.md
333+
- VHOST_SOURCE_URL=https://github.com/dockerizedrupal/docker-memcachephp
318334
EOF
319335
}
320336

@@ -357,8 +373,9 @@ apache:
357373
environment:
358374
- VHOST_PROJECT_NAME=${PROJECT_NAME}
359375
- VHOST_SERVICE_NAME=apache
360-
- VHOST_PRIMARY_SERVICE=Yes
361376
- VHOST_VERSION_FILE=https://raw.githubusercontent.com/dockerizedrupal/docker-apache-2.2/master/VERSION.md
377+
- VHOST_SOURCE_URL=https://github.com/dockerizedrupal/docker-apache-2.2
378+
- VHOST_PRIMARY_SERVICE=Yes
362379
apache-data:
363380
image: dockerizedrupal/data:1.0.3
364381
hostname: apache-data
@@ -373,6 +390,7 @@ mysql:
373390
- VHOST_PROJECT_NAME=${PROJECT_NAME}
374391
- VHOST_SERVICE_NAME=mysql
375392
- VHOST_VERSION_FILE=https://raw.githubusercontent.com/dockerizedrupal/docker-mysql/master/VERSION.md
393+
- VHOST_SOURCE_URL=https://github.com/dockerizedrupal/docker-mysql
376394
mysql-data:
377395
image: dockerizedrupal/data:1.0.3
378396
hostname: mysql-data
@@ -397,6 +415,7 @@ php:
397415
- VHOST_PROJECT_NAME=${PROJECT_NAME}
398416
- VHOST_SERVICE_NAME=php
399417
- VHOST_VERSION_FILE=https://raw.githubusercontent.com/dockerizedrupal/docker-php-5.2/master/VERSION.md
418+
- VHOST_SOURCE_URL=https://github.com/dockerizedrupal/docker-php-5.2
400419
mailcatcher:
401420
image: dockerizedrupal/mailcatcher:1.0.2
402421
hostname: mailcatcher
@@ -407,6 +426,7 @@ mailcatcher:
407426
- VHOST_PROJECT_NAME=${PROJECT_NAME}
408427
- VHOST_SERVICE_NAME=mailcatcher
409428
- VHOST_VERSION_FILE=https://raw.githubusercontent.com/dockerizedrupal/docker-mailcatcher/master/VERSION.md
429+
- VHOST_SOURCE_URL=https://github.com/dockerizedrupal/docker-mailcatcher
410430
phpmyadmin:
411431
image: dockerizedrupal/phpmyadmin:1.0.3
412432
hostname: phpmyadmin
@@ -419,6 +439,7 @@ phpmyadmin:
419439
- VHOST_PROJECT_NAME=${PROJECT_NAME}
420440
- VHOST_SERVICE_NAME=phpmyadmin
421441
- VHOST_VERSION_FILE=https://raw.githubusercontent.com/dockerizedrupal/docker-phpmyadmin/master/VERSION.md
442+
- VHOST_SOURCE_URL=https://github.com/dockerizedrupal/docker-phpmyadmin
422443
adminer:
423444
image: dockerizedrupal/adminer:1.0.4
424445
hostname: adminer
@@ -431,13 +452,15 @@ adminer:
431452
- VHOST_PROJECT_NAME=${PROJECT_NAME}
432453
- VHOST_SERVICE_NAME=adminer
433454
- VHOST_VERSION_FILE=https://raw.githubusercontent.com/dockerizedrupal/docker-adminer/master/VERSION.md
455+
- VHOST_SOURCE_URL=https://github.com/dockerizedrupal/docker-adminer
434456
memcached:
435457
image: dockerizedrupal/memcached:1.0.2
436458
hostname: memcached
437459
environment:
438460
- VHOST_PROJECT_NAME=${PROJECT_NAME}
439461
- VHOST_SERVICE_NAME=memcached
440462
- VHOST_VERSION_FILE=https://raw.githubusercontent.com/dockerizedrupal/docker-memcached/master/VERSION.md
463+
- VHOST_SOURCE_URL=https://github.com/dockerizedrupal/docker-memcached
441464
memcachephp:
442465
image: dockerizedrupal/memcachephp:1.0.2
443466
hostname: memcachephp
@@ -450,6 +473,7 @@ memcachephp:
450473
- VHOST_PROJECT_NAME=${PROJECT_NAME}
451474
- VHOST_SERVICE_NAME=memcachephp
452475
- VHOST_VERSION_FILE=https://raw.githubusercontent.com/dockerizedrupal/docker-memcachephp/master/VERSION.md
476+
- VHOST_SOURCE_URL=https://github.com/dockerizedrupal/docker-memcachephp
453477
EOF
454478
}
455479

0 commit comments

Comments
 (0)