From 8590cc577b7d587d162d9002ec97733c7ffcc465 Mon Sep 17 00:00:00 2001
From: andryyy <andre.peters@debinux.de>
Date: Sun, 25 Jun 2017 00:21:24 +0200
Subject: [PATCH] Move folder names to match image names

---
 data/Dockerfiles/{clamav => clamd}/Dockerfile             | 0
 data/Dockerfiles/{clamav => clamd}/bootstrap.sh           | 0
 data/Dockerfiles/{clamav => clamd}/dl_files.sh            | 0
 data/Dockerfiles/{php-fpm => phpfpm}/Dockerfile           | 0
 data/Dockerfiles/{php-fpm => phpfpm}/docker-entrypoint.sh | 0
 docker-compose.yml                                        | 4 ++--
 6 files changed, 2 insertions(+), 2 deletions(-)
 rename data/Dockerfiles/{clamav => clamd}/Dockerfile (100%)
 rename data/Dockerfiles/{clamav => clamd}/bootstrap.sh (100%)
 rename data/Dockerfiles/{clamav => clamd}/dl_files.sh (100%)
 rename data/Dockerfiles/{php-fpm => phpfpm}/Dockerfile (100%)
 rename data/Dockerfiles/{php-fpm => phpfpm}/docker-entrypoint.sh (100%)

diff --git a/data/Dockerfiles/clamav/Dockerfile b/data/Dockerfiles/clamd/Dockerfile
similarity index 100%
rename from data/Dockerfiles/clamav/Dockerfile
rename to data/Dockerfiles/clamd/Dockerfile
diff --git a/data/Dockerfiles/clamav/bootstrap.sh b/data/Dockerfiles/clamd/bootstrap.sh
similarity index 100%
rename from data/Dockerfiles/clamav/bootstrap.sh
rename to data/Dockerfiles/clamd/bootstrap.sh
diff --git a/data/Dockerfiles/clamav/dl_files.sh b/data/Dockerfiles/clamd/dl_files.sh
similarity index 100%
rename from data/Dockerfiles/clamav/dl_files.sh
rename to data/Dockerfiles/clamd/dl_files.sh
diff --git a/data/Dockerfiles/php-fpm/Dockerfile b/data/Dockerfiles/phpfpm/Dockerfile
similarity index 100%
rename from data/Dockerfiles/php-fpm/Dockerfile
rename to data/Dockerfiles/phpfpm/Dockerfile
diff --git a/data/Dockerfiles/php-fpm/docker-entrypoint.sh b/data/Dockerfiles/phpfpm/docker-entrypoint.sh
similarity index 100%
rename from data/Dockerfiles/php-fpm/docker-entrypoint.sh
rename to data/Dockerfiles/phpfpm/docker-entrypoint.sh
diff --git a/docker-compose.yml b/docker-compose.yml
index 3573f5e4..2c9f6666 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -67,7 +67,7 @@ services:
 
     clamd-mailcow:
       image: mailcow/clamd:1.0
-      build: ./data/Dockerfiles/clamav
+      build: ./data/Dockerfiles/clamd
       restart: always
       dns:
         - 172.22.1.254
@@ -109,7 +109,7 @@ services:
 
     php-fpm-mailcow:
       image: mailcow/phpfpm:1.0
-      build: ./data/Dockerfiles/php-fpm
+      build: ./data/Dockerfiles/phpfpm
       command: "php-fpm -d date.timezone=${TZ}"
       depends_on:
         - redis-mailcow