From b27eb41a03bada4808a66836a00af43a4b95304b Mon Sep 17 00:00:00 2001
From: Tuschl <tuschl@digitalmobil.com>
Date: Tue, 25 Jul 2017 19:26:16 +0200
Subject: [PATCH] Move docker files to toplevel

DockerHub automated builds stubbornly refuse to see the files inside the
docker dir. Moving them top level to play nice :-/
---
 .dockerignore                                   | 2 +-
 docker/Dockerfile => Dockerfile                 | 2 +-
 README.md                                       | 6 +++---
 docker/apache2-foreground => apache2-foreground | 0
 4 files changed, 5 insertions(+), 5 deletions(-)
 rename docker/Dockerfile => Dockerfile (98%)
 rename docker/apache2-foreground => apache2-foreground (100%)

diff --git a/.dockerignore b/.dockerignore
index fd9d3a5..7915c0c 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,3 +1,3 @@
 *
 !ifm.php
-!docker/apache2-foreground
+!apache2-foreground
diff --git a/docker/Dockerfile b/Dockerfile
similarity index 98%
rename from docker/Dockerfile
rename to Dockerfile
index 8240c2e..0a068cb 100644
--- a/docker/Dockerfile
+++ b/Dockerfile
@@ -80,7 +80,7 @@ RUN { \
         echo 'error_log = "/var/www/php.log"';      \
     } > $PHP_INI_DIR/conf.d/ZZ_ifm.ini 
     
-COPY docker/apache2-foreground /usr/local/bin/
+COPY apache2-foreground /usr/local/bin/
 
 COPY ifm.php /var/www/html/index.php
 
diff --git a/README.md b/README.md
index 8a5f0f7..7120e55 100644
--- a/README.md
+++ b/README.md
@@ -29,17 +29,17 @@ Just copy the ifm.php to your webspace - thats all :)
 
 ## docker
 
-The docker image is based on alpine 3.5 for a small image footprint, with necessary apache, php and supporting packages installed.
+The docker image is based on alpine 3.5 for a small image footprint, with necessary apache, php and supporting packages installed and exposes port 80.
 
 ### build image
 
 Run the following command from the top source dir:
 
-`docker build -t ifm -f docker/Docker .`
+`docker build -t ifm .`
 
 ### run image
 
-The script installed inside the image at `/var/www/html/index.php`. Its default configuration is unchanged, thus it will display the contents of the document root (`/var/www/html`).  
+The script is installed inside the image at `/var/www/html/index.php`. Its default configuration is unchanged, thus it will display the contents of the document root (`/var/www/html`).  
 
 Here is an example of how to start up a container with this image:
 `docker run --rm -i -p "9090:80" -v "/data:/var/www/html/data" ifm`
diff --git a/docker/apache2-foreground b/apache2-foreground
similarity index 100%
rename from docker/apache2-foreground
rename to apache2-foreground