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

Commit 2e62913

Browse files
committed
1 parent 87a4ba8 commit 2e62913

File tree

5 files changed

+22
-14
lines changed

5 files changed

+22
-14
lines changed

Gruntfile.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
var current_version = '1.1.7';
2-
var new_version = '1.1.8';
1+
var current_version = '1.1.8';
2+
var new_version = '1.2.0';
33

44
module.exports = function(grunt) {
55
grunt.loadNpmTasks('grunt-replace');

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ This project is part of the [Dockerized Drupal](https://dockerizedrupal.com/) in
1818
TMP="$(mktemp -d)" \
1919
&& git clone https://github.com/dockerizedrupal/drupal-compose.git "${TMP}" \
2020
&& cd "${TMP}" \
21-
&& git checkout 1.1.8 \
21+
&& git checkout 1.2.0 \
2222
&& sudo cp "${TMP}/drupal-compose.sh" /usr/local/bin/drupal-compose \
2323
&& sudo chmod +x /usr/local/bin/drupal-compose \
2424
&& cd -

VERSION.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.1.8
1+
1.2.0

drupal-compose.sh

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

3-
VERSION="1.1.8"
3+
VERSION="1.2.0"
44

55
WORKING_DIR="$(pwd)"
66

@@ -88,8 +88,9 @@ apache:
8888
- VHOST_VERSION_FILE_URL=https://raw.githubusercontent.com/dockerizedrupal/docker-apache-2.4/master/VERSION.md
8989
- VHOST_REPOSITORY_URL=https://hub.docker.com/r/dockerizedrupal/apache-2.4/
9090
apache-data:
91-
image: dockerizedrupal/data:1.1.0
91+
image: dockerizedrupal/apache-2.4:1.1.2
9292
hostname: apache-data
93+
entrypoint: ["/bin/echo", "Data-only container for Apache."]
9394
volumes:
9495
- .:/apache/data
9596
mysql:
@@ -103,8 +104,9 @@ mysql:
103104
- VHOST_VERSION_FILE_URL=https://raw.githubusercontent.com/dockerizedrupal/docker-mysql/master/VERSION.md
104105
- VHOST_REPOSITORY_URL=https://hub.docker.com/r/dockerizedrupal/mysql/
105106
mysql-data:
106-
image: dockerizedrupal/data:1.1.0
107+
image: dockerizedrupal/mysql:1.1.0
107108
hostname: mysql-data
109+
entrypoint: ["/bin/echo", "Data-only container for MySQL."]
108110
volumes:
109111
- /mysql
110112
php:
@@ -197,8 +199,9 @@ apache:
197199
- VHOST_VERSION_FILE_URL=https://raw.githubusercontent.com/dockerizedrupal/docker-apache-2.4/master/VERSION.md
198200
- VHOST_REPOSITORY_URL=https://hub.docker.com/r/dockerizedrupal/apache-2.4/
199201
apache-data:
200-
image: dockerizedrupal/data:1.1.0
202+
image: dockerizedrupal/apache-2.4:1.1.2
201203
hostname: apache-data
204+
entrypoint: ["/bin/echo", "Data-only container for Apache."]
202205
volumes:
203206
- .:/apache/data
204207
mysql:
@@ -212,8 +215,9 @@ mysql:
212215
- VHOST_VERSION_FILE_URL=https://raw.githubusercontent.com/dockerizedrupal/docker-mysql/master/VERSION.md
213216
- VHOST_REPOSITORY_URL=https://hub.docker.com/r/dockerizedrupal/mysql/
214217
mysql-data:
215-
image: dockerizedrupal/data:1.1.0
218+
image: dockerizedrupal/mysql:1.1.0
216219
hostname: mysql-data
220+
entrypoint: ["/bin/echo", "Data-only container for MySQL."]
217221
volumes:
218222
- /mysql
219223
php:
@@ -325,8 +329,9 @@ apache:
325329
- VHOST_VERSION_FILE_URL=https://raw.githubusercontent.com/dockerizedrupal/docker-apache-2.4/master/VERSION.md
326330
- VHOST_REPOSITORY_URL=https://hub.docker.com/r/dockerizedrupal/apache-2.4/
327331
apache-data:
328-
image: dockerizedrupal/data:1.1.0
332+
image: dockerizedrupal/apache-2.4:1.1.2
329333
hostname: apache-data
334+
entrypoint: ["/bin/echo", "Data-only container for Apache."]
330335
volumes:
331336
- .:/apache/data
332337
mysql:
@@ -340,8 +345,9 @@ mysql:
340345
- VHOST_VERSION_FILE_URL=https://raw.githubusercontent.com/dockerizedrupal/docker-mysql/master/VERSION.md
341346
- VHOST_REPOSITORY_URL=https://hub.docker.com/r/dockerizedrupal/mysql/
342347
mysql-data:
343-
image: dockerizedrupal/data:1.1.0
348+
image: dockerizedrupal/mysql:1.1.0
344349
hostname: mysql-data
350+
entrypoint: ["/bin/echo", "Data-only container for MySQL."]
345351
volumes:
346352
- /mysql
347353
php:
@@ -453,8 +459,9 @@ apache:
453459
- VHOST_VERSION_FILE_URL=https://raw.githubusercontent.com/dockerizedrupal/docker-apache-2.2/master/VERSION.md
454460
- VHOST_REPOSITORY_URL=https://hub.docker.com/r/dockerizedrupal/apache-2.2/
455461
apache-data:
456-
image: dockerizedrupal/data:1.1.0
462+
image: dockerizedrupal/apache-2.2:1.1.2
457463
hostname: apache-data
464+
entrypoint: ["/bin/echo", "Data-only container for Apache."]
458465
volumes:
459466
- .:/apache/data
460467
mysql:
@@ -468,8 +475,9 @@ mysql:
468475
- VHOST_VERSION_FILE_URL=https://raw.githubusercontent.com/dockerizedrupal/docker-mysql/master/VERSION.md
469476
- VHOST_REPOSITORY_URL=https://hub.docker.com/r/dockerizedrupal/mysql/
470477
mysql-data:
471-
image: dockerizedrupal/data:1.1.0
478+
image: dockerizedrupal/mysql:1.1.0
472479
hostname: mysql-data
480+
entrypoint: ["/bin/echo", "Data-only container for MySQL."]
473481
volumes:
474482
- /mysql
475483
php:

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "drupal-compose",
3-
"version": "1.1.8",
3+
"version": "1.2.0",
44
"dependencies": {
55
"grunt": "^0.4.5",
66
"grunt-replace": "^0.11.0"

0 commit comments

Comments
 (0)