Add easyrdf.patch

distillery/resources/compose/runtime/.dockerignore

@@ -4,3 +4,4 @@
 # allow the following files:
 !conf/*
 !scripts/*
+!patch/*

distillery/resources/compose/runtime/Dockerfile

@@ -51,6 +51,9 @@ ENV PATH "/usr/local/bin:/var/www/data/project/vendor/bin:$PATH"
 # remove default configuration
 RUN rm /etc/apache2/sites-available/*.conf && \
     rm /etc/apache2/sites-enabled/*.conf
+
+ADD patch/easyrdf.patch /patch/easyrdf.patch
+
 # Add wisski configuration
 ADD conf/ports.conf /etc/apache2/ports.conf
 ADD conf/wisski.conf /etc/apache2/sites-available/wisski.conf

distillery/resources/compose/runtime/patch/easyrdf.patch

@@ -0,0 +1,4 @@
+281c281
+<         if (preg_match("|^HTTP/([\d\.x]+) (\d+) ([^\r\n]+)|", $status, $m)) {
+---
+>         if(preg_match("|^HTTP/([\d\.x]+) (\d+) ([^\r\n]*)|", $status, $m)) {

distillery/resources/compose/runtime/scripts/provision_container.sh

@@ -107,6 +107,11 @@ log_info " => Enable Wisski modules"
 drush pm-enable --yes wisski_core wisski_linkblock wisski_pathbuilder wisski_adapter_sparql11_pb wisski_salz
 drupal_sites_permission_workaround
 
+# Because of a regresssion in EasyRDF and Tomcat, we need to manually patch EasyRDF
+EASYRDF_RESPONSE="$COMPOSER_DIR/vendor/easyrdf/easyrdf/lib/EasyRdf/Http/Response.php"
+log_info " => Patching '$EASYRDF_RESPONSE'"
+patch "$EASYRDF_RESPONSE" < "/patch/easyrdf.patch"
+
 log_info " => Provisioning is now complete. "
 log_ok "Your installation details are as follows:"
 function printdetails() {