From 8fc080898b62567d6b99f8eaa06ae125d82eccaa Mon Sep 17 00:00:00 2001
From: kaiyou <pierre@jaury.eu>
Date: Sun, 17 Sep 2017 19:19:28 +0200
Subject: [PATCH] Prepare the webmail to be accessed at / directly

---
 rainloop/Dockerfile  | 6 +++---
 roundcube/Dockerfile | 9 ++++-----
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/rainloop/Dockerfile b/rainloop/Dockerfile
index 7ee9b97f..8a340cc7 100644
--- a/rainloop/Dockerfile
+++ b/rainloop/Dockerfile
@@ -6,8 +6,8 @@ RUN apt-get update && apt-get install -y \
 ENV RAINLOOP_URL https://github.com/RainLoop/rainloop-webmail/releases/download/v1.10.3.151/rainloop-community-1.10.3.151-aa8d0c41baec166a35bb9855ee3d07b9.zip
 
 RUN rm -rf /var/www/html/ \
- && mkdir -p /var/www/html/webmail \
- && cd /var/www/html/webmail \
+ && mkdir /var/www/html \
+ && cd /var/www/html \
  && curl -L -O ${RAINLOOP_URL} \
  && unzip *.zip \
  && rm -f *.zip \
@@ -16,7 +16,7 @@ RUN rm -rf /var/www/html/ \
  && find . -type f -exec chmod 644 {} \; \
  && chown -R www-data: *
 
-COPY include.php /var/www/html/webmail/include.php
+COPY include.php /var/www/html/include.php
 COPY php.ini /usr/local/etc/php/conf.d/rainloop.ini
 
 COPY config.ini /config.ini
diff --git a/roundcube/Dockerfile b/roundcube/Dockerfile
index 995a0c1c..eb8a1667 100644
--- a/roundcube/Dockerfile
+++ b/roundcube/Dockerfile
@@ -12,17 +12,16 @@ ENV ROUNDCUBE_URL https://github.com/roundcube/roundcubemail/releases/download/1
 RUN echo date.timezone=UTC > /usr/local/etc/php/conf.d/timezone.ini
 
 RUN rm -rf /var/www/html/ \
- && mkdir /var/www/html \
- && cd /var/www/html \
+ && cd /var/www \
  && curl -L -O ${ROUNDCUBE_URL} \
  && tar -xf *.tar.gz \
  && rm -f *.tar.gz \
- && mv roundcubemail-* webmail \
- && cd webmail \
+ && mv roundcubemail-* html \
+ && cd html \
  && rm -rf CHANGELOG INSTALL LICENSE README.md UPGRADING composer.json-dist installer \
  && chown -R www-data: logs
 
-COPY config.inc.php /var/www/html/webmail/config/
+COPY config.inc.php /var/www/html/config/
 
 COPY start.sh /start.sh