Merge pull request #4 from camptocamp/more-flexible

Be more flexible, add missing doc.
camptocamp · Jul 15, 2016 · 8aa4b1e · 8aa4b1e
2 parents 503d3a1 + 0a7e9ad
commit 8aa4b1e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -37,8 +37,6 @@ EXPOSE 80
 
 COPY . /
 
-ONBUILD COPY mapserver.map /etc/mapserver/
-
 ENTRYPOINT ["/docker-entrypoint.sh"]
 
 CMD ["apache2", "-DFOREGROUND"]
diff --git a/README.md b/README.md
@@ -9,6 +9,8 @@ COPY *.map /etc/mapserver/
 COPY *.sh *.env /docker-entrypoint.d/
 ```
 
+The main mapfile should be `/etc/mapserver/mapserver.map`.
+
 Or you can use the image as is and mount volumes to customize it.
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,6 +9,8 @@ COPY *.map /etc/mapserver/ @@
     COPY *.sh *.env /docker-entrypoint.d/
     ```
+    The main mapfile should be `/etc/mapserver/mapserver.map`.
     Or you can use the image as is and mount volumes to customize it.
@@ Expand Down @@