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

Commit c72590f

Browse files
committed
Update
1 parent 6370f6c commit c72590f

6 files changed

Lines changed: 19 additions & 18 deletions

File tree

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.4.1';
2-
var new_version = '1.4.2';
1+
var current_version = '1.4.2';
2+
var new_version = '1.4.3';
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 @@ Generates general purpose [docker-compose.yml](https://docs.docker.com/compose/y
1818
TMP="$(mktemp -d)" \
1919
&& git clone https://github.com/dockerizedrupal/drupal-compose.git "${TMP}" \
2020
&& cd "${TMP}" \
21-
&& git checkout 1.4.2 \
21+
&& git checkout 1.4.3 \
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.4.2
1+
1.4.3

Vagrantfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
VERSION = "1.4.2"
1+
VERSION = "1.4.3"
22

33
require 'yaml'
44

drupal-compose.sh

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

3-
VERSION="1.4.2"
3+
VERSION="1.4.3"
44

55
WORKING_DIR="$(pwd)"
66

@@ -35,7 +35,7 @@ APACHE_22_VERSION_FILE_URL="https://raw.githubusercontent.com/dockerizedrupal/do
3535
APACHE_22_TAG="$(wget ${APACHE_22_VERSION_FILE_URL} -q -O -)"
3636

3737
if [ -z "${APACHE_22_TAG}" ]; then
38-
APACHE_22_TAG="1.2.2"
38+
APACHE_22_TAG="1.2.3"
3939

4040
echo "drupal-compose: Couldn't retrieve the latest Apache 2.2 image version. Falling back to last known stable version: ${APACHE_22_TAG}."
4141
fi
@@ -44,7 +44,7 @@ APACHE_24_VERSION_FILE_URL="https://raw.githubusercontent.com/dockerizedrupal/do
4444
APACHE_24_TAG="$(wget ${APACHE_24_VERSION_FILE_URL} -q -O -)"
4545

4646
if [ -z "${APACHE_24_TAG}" ]; then
47-
APACHE_24_TAG="1.2.2"
47+
APACHE_24_TAG="1.2.4"
4848

4949
echo "drupal-compose: Couldn't retrieve the latest Apache 2.4 image version. Falling back to last known stable version: ${APACHE_24_TAG}."
5050
fi
@@ -53,7 +53,7 @@ PHP_52_VERSION_FILE_URL="https://raw.githubusercontent.com/dockerizedrupal/docke
5353
PHP_52_TAG="$(wget ${PHP_52_VERSION_FILE_URL} -q -O -)"
5454

5555
if [ -z "${PHP_52_TAG}" ]; then
56-
PHP_52_TAG="1.2.5"
56+
PHP_52_TAG="1.2.7"
5757

5858
echo "drupal-compose: Couldn't retrieve the latest PHP 5.2 image version. Falling back to last known stable version: ${PHP_52_TAG}."
5959
fi
@@ -62,7 +62,7 @@ PHP_53_VERSION_FILE_URL="https://raw.githubusercontent.com/dockerizedrupal/docke
6262
PHP_53_TAG="$(wget ${PHP_53_VERSION_FILE_URL} -q -O -)"
6363

6464
if [ -z "${PHP_53_TAG}" ]; then
65-
PHP_53_TAG="1.2.9"
65+
PHP_53_TAG="1.2.11"
6666

6767
echo "drupal-compose: Couldn't retrieve the latest PHP 5.3 image version. Falling back to last known stable version: ${PHP_53_TAG}."
6868
fi
@@ -71,7 +71,7 @@ PHP_54_VERSION_FILE_URL="https://raw.githubusercontent.com/dockerizedrupal/docke
7171
PHP_54_TAG="$(wget ${PHP_54_VERSION_FILE_URL} -q -O -)"
7272

7373
if [ -z "${PHP_54_TAG}" ]; then
74-
PHP_54_TAG="1.2.7"
74+
PHP_54_TAG="1.2.9"
7575

7676
echo "drupal-compose: Couldn't retrieve the latest PHP 5.4 image version. Falling back to last known stable version: ${PHP_54_TAG}."
7777
fi
@@ -80,7 +80,7 @@ PHP_55_VERSION_FILE_URL="https://raw.githubusercontent.com/dockerizedrupal/docke
8080
PHP_55_TAG="$(wget ${PHP_55_VERSION_FILE_URL} -q -O -)"
8181

8282
if [ -z "${PHP_55_TAG}" ]; then
83-
PHP_55_TAG="1.2.9"
83+
PHP_55_TAG="1.2.11"
8484

8585
echo "drupal-compose: Couldn't retrieve the latest PHP 5.5 image version. Falling back to last known stable version: ${PHP_55_TAG}."
8686
fi
@@ -89,7 +89,7 @@ PHP_56_VERSION_FILE_URL="https://raw.githubusercontent.com/dockerizedrupal/docke
8989
PHP_56_TAG="$(wget ${PHP_56_VERSION_FILE_URL} -q -O -)"
9090

9191
if [ -z "${PHP_56_TAG}" ]; then
92-
PHP_56_TAG="1.2.7"
92+
PHP_56_TAG="1.2.9"
9393

9494
echo "drupal-compose: Couldn't retrieve the latest PHP 5.6 image version. Falling back to last known stable version: ${PHP_56_TAG}."
9595
fi
@@ -98,7 +98,7 @@ PHP_70_VERSION_FILE_URL="https://raw.githubusercontent.com/dockerizedrupal/docke
9898
PHP_70_TAG="$(wget ${PHP_70_VERSION_FILE_URL} -q -O -)"
9999

100100
if [ -z "${PHP_70_TAG}" ]; then
101-
PHP_70_TAG="1.1.0"
101+
PHP_70_TAG="1.1.2"
102102

103103
echo "drupal-compose: Couldn't retrieve the latest PHP 7.0 image version. Falling back to last known stable version: ${PHP_70_TAG}."
104104
fi
@@ -229,7 +229,7 @@ php:
229229
extends:
230230
file: host.yml
231231
service: php
232-
image: dockerizedrupal/php-5.6:${PHP_56_TAG}
232+
image: dockerizedrupal/php-7.0:${PHP_70_TAG}
233233
hostname: php
234234
volumes:
235235
- ~/.ssh:/home/container/.ssh
@@ -242,8 +242,8 @@ php:
242242
environment:
243243
- VHOST_PROJECT_NAME=${PROJECT_NAME}
244244
- VHOST_SERVICE_NAME=php
245-
- VHOST_VERSION_FILE_URL=${PHP_56_VERSION_FILE_URL}
246-
- VHOST_REPOSITORY_URL=https://hub.docker.com/r/dockerizedrupal/php-5.6/
245+
- VHOST_VERSION_FILE_URL=${PHP_70_VERSION_FILE_URL}
246+
- VHOST_REPOSITORY_URL=https://hub.docker.com/r/dockerizedrupal/php-7.0/
247247
mailcatcher:
248248
image: dockerizedrupal/mailcatcher:${MAILCATCHER_TAG}
249249
hostname: mailcatcher
@@ -314,6 +314,7 @@ apache:
314314
- VHOST_SERVICE_NAME=apache
315315
- VHOST_VERSION_FILE_URL=${APACHE_24_VERSION_FILE_URL}
316316
- VHOST_REPOSITORY_URL=https://hub.docker.com/r/dockerizedrupal/apache-2.4/
317+
- NO_GZIP=On
317318
apache-data:
318319
image: dockerizedrupal/apache-2.4:${APACHE_24_TAG}
319320
hostname: apache-data

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.4.2",
3+
"version": "1.4.3",
44
"repository": {
55
"type": "git",
66
"url": "https://github.com/dockerizedrupal/drupal-compose.git"

0 commit comments

Comments
 (0)