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

Commit 9bd9be0

Browse files
committed
Update
1 parent ffc7928 commit 9bd9be0

7 files changed

Lines changed: 11 additions & 9 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.0.12';
2-
var new_version = '1.1.0';
1+
var current_version = '1.1.0';
2+
var new_version = '1.1.1';
33

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

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,15 @@ This project is part of the [Dockerized Drupal](https://dockerizedrupal.com/) in
3535
-e USER_ID="" \
3636
-e GROUP_ID="" \
3737
-d \
38-
dockerizedrupal/apache-2.2:1.1.0
38+
dockerizedrupal/apache-2.2:1.1.1
3939

4040
## Build the image
4141

4242
TMP="$(mktemp -d)" \
4343
&& git clone https://github.com/dockerizedrupal/docker-apache-2.2.git "${TMP}" \
4444
&& cd "${TMP}" \
45-
&& git checkout 1.1.0 \
46-
&& sudo docker build -t dockerizedrupal/apache-2.2:1.1.0 . \
45+
&& git checkout 1.1.1 \
46+
&& sudo docker build -t dockerizedrupal/apache-2.2:1.1.1 . \
4747
&& cd -
4848

4949
## Changing the container behaviour on runtime through environment variables

VERSION.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.1.0
1+
1.1.1

docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
apache:
2-
image: dockerizedrupal/apache-2.2:1.1.0
2+
image: dockerizedrupal/apache-2.2:1.1.1
33
hostname: apache
44
ports:
55
- "80:80"

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "docker-apache-2.2",
3-
"version": "1.1.0",
3+
"version": "1.1.1",
44
"dependencies": {
55
"grunt": "^0.4.5",
66
"grunt-replace": "^0.11.0"

src/apache-2.2/run/modules/run/manifests/apache22.pp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,4 +85,6 @@
8585
}
8686

8787
bash_exec { 'mkdir -p /apache/data': }
88+
89+
bash_exec { 'rm -rf /var/run/apache2/apache2.pid': }
8890
}

tests/apache-2.2_kerberos.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
apache:
2-
image: dockerizedrupal/apache-2.2:1.1.0
2+
image: dockerizedrupal/apache-2.2:1.1.1
33
hostname: apache
44
environment:
55
- KERBEROS_DEFAULT_REALM=default-realm

0 commit comments

Comments
 (0)