Update

Author: viljaste

Gruntfile.js

@@ -1,5 +1,5 @@
-var current_version = '1.1.0';
-var new_version = '1.1.1';
+var current_version = '1.1.1';
+var new_version = '1.1.2';
 
 module.exports = function(grunt) {
   grunt.loadNpmTasks('grunt-replace');

README.md

@@ -35,15 +35,15 @@ This project is part of the [Dockerized Drupal](https://dockerizedrupal.com/) in
       -e USER_ID="" \
       -e GROUP_ID="" \
       -d \
-      dockerizedrupal/apache-2.2:1.1.1
+      dockerizedrupal/apache-2.2:1.1.2
 
 ## Build the image
 
     TMP="$(mktemp -d)" \
       && git clone https://github.com/dockerizedrupal/docker-apache-2.2.git "${TMP}" \
       && cd "${TMP}" \
-      && git checkout 1.1.1 \
-      && sudo docker build -t dockerizedrupal/apache-2.2:1.1.1 . \
+      && git checkout 1.1.2 \
+      && sudo docker build -t dockerizedrupal/apache-2.2:1.1.2 . \
       && cd -
 
 ## Changing the container behaviour on runtime through environment variables

VERSION.md

@@ -1 +1 @@
-1.1.1
+1.1.2

docker-compose.yml

@@ -1,5 +1,5 @@
 apache:
-  image: dockerizedrupal/apache-2.2:1.1.1
+  image: dockerizedrupal/apache-2.2:1.1.2
   hostname: apache
   ports:
     - "80:80"

package.json

@@ -1,6 +1,6 @@
 {
   "name": "docker-apache-2.2",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "dependencies": {
     "grunt": "^0.4.5",
     "grunt-replace": "^0.11.0"

src/apache-2.2/run/modules/run/templates/krb5.conf.erb

@@ -40,7 +40,7 @@
 
 [realms]
 <% scope.to_hash.keys.each do |variable| -%>
-<% if (variable =~ /^kerberos_[[:digit:]]_realm$/) -%>
+<% if (variable =~ /^kerberos_[[:digit:]]+_realm$/) -%>
 <% i = variable.split('_')[1] -%>
         <%= eval("@kerberos_#{i}_realm") %> = {
                 kdc = <%= eval("@kerberos_#{i}_kdc") %>
@@ -51,7 +51,7 @@
 
 [domain_realm]
 <% scope.to_hash.keys.each do |variable| -%>
-<% if (variable =~ /^kerberos_[[:digit:]]_realm$/) -%>
+<% if (variable =~ /^kerberos_[[:digit:]]+_realm$/) -%>
 <% i = variable.split('_')[1] -%>
         <%= eval("@kerberos_#{i}_domain") %> = <%= eval("@kerberos_#{i}_realm") %>
 <% end -%>

src/apache-2.2/variables.sh

@@ -57,7 +57,7 @@ export FACTER_GROUP_ID="${GROUP_ID}"
 export FACTER_KERBEROS_DEFAULT_REALM="${KERBEROS_DEFAULT_REALM}"
 
 for VARIABLE in $(env); do
-  if [[ "${VARIABLE}" =~ ^KERBEROS_[[:digit:]]_REALM=.*$ ]]; then
+  if [[ "${VARIABLE}" =~ ^KERBEROS_[[:digit:]]+_REALM=.*$ ]]; then
     i="$(echo ${VARIABLE} | awk -F '_' '{ print $2 }')"
 
     KERBEROS_REALM="KERBEROS_${i}_REALM"

tests/apache-2.2_kerberos.yml

@@ -1,5 +1,5 @@
 apache:
-  image: dockerizedrupal/apache-2.2:1.1.1
+  image: dockerizedrupal/apache-2.2:1.1.2
   hostname: apache
   environment:
     - KERBEROS_DEFAULT_REALM=default-realm