From b739b6c7db2eaae646f5c04e59f23b5a4ff1f47f Mon Sep 17 00:00:00 2001
From: pierreozoux <pierre@ozoux.net>
Date: Thu, 12 Mar 2015 19:57:50 +0000
Subject: [PATCH] Fixes email and charset error, closes #44
---
dockerfiles/services/nginx-php/Dockerfile | 1 +
dockerfiles/services/owncloud/Dockerfile | 3 +--
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dockerfiles/services/nginx-php/Dockerfile b/dockerfiles/services/nginx-php/Dockerfile
index 4d0bedc..6e135cf 100644
--- a/dockerfiles/services/nginx-php/Dockerfile
+++ b/dockerfiles/services/nginx-php/Dockerfile
@@ -16,6 +16,7 @@ RUN apt-get update && apt-get install -y \
sed -i 's/error_log.*/error_log \/dev\/stdout info;/g' /etc/nginx/nginx.conf && \
sed -i 's/^pid/daemon off;\npid/g' /etc/nginx/nginx.conf && \
sed -i "s/.*sendmail_path.*/sendmail_path = \/usr\/sbin\/ssmtp -t/g" /etc/php5/fpm/php.ini && \
+ sed -i 's/;default_charset.*/default_charset = "UTF-8"/g' /etc/php5/fpm/php.ini && \
sed -i 's/;cgi.fix_pathinfo=1/cgi.fix_pathinfo=0/g' /etc/php5/fpm/php.ini
ADD basic.conf /etc/nginx/conf.d/basic.conf
diff --git a/dockerfiles/services/owncloud/Dockerfile b/dockerfiles/services/owncloud/Dockerfile
index cad3da9..6b1a5ec 100644
--- a/dockerfiles/services/owncloud/Dockerfile
+++ b/dockerfiles/services/owncloud/Dockerfile
@@ -5,8 +5,7 @@ RUN echo 'deb http://download.opensuse.org/repositories/isv:/ownCloud:/community
curl -L http://download.opensuse.org/repositories/isv:ownCloud:community/Debian_7.0/Release.key | apt-key add - && \
apt-get update && apt-get install -y \
owncloud \
- php5-imap \
- sendmail && \
+ php5-imap && \
apt-get install -y --no-install-recommends \
libreoffice && \
rm -rf /var/lib/apt/lists/* && \
--
GitLab