recognize baked-in /etc/exports. fixes obeone#9

Author: ehough

CHANGELOG.md

@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [Unreleased]
+
+### Fixed
+
+* baked-in `/etc/exports` is not properly recognized ([#9](https://github.com/ehough/docker-nfs-server/issues/9))
+
 ## [1.1.0] - 2018-06-06
 
 ### Added

Dockerfile

@@ -12,8 +12,8 @@ RUN apt-get update
     apt-get clean                                                                 && \
     rm -rf /var/lib/apt/lists                                                     && \
                                                                                      \
-    # remove the default idmapd.conf
-    rm -v /etc/idmapd.conf
+    # remove the default config files
+    rm -v /etc/idmapd.conf /etc/exports
 
 # http://wiki.linux-nfs.org/wiki/index.php/Nfsv4_configuration
 RUN mkdir -p /var/lib/nfs/rpc_pipefs && \

entrypoint.sh

@@ -303,8 +303,15 @@ init_trap() {
 
 init_exports() {
 
+  # first, see if it's bind-mounted
   if mount | grep -Eq "^[^ ]+ on $PATH_FILE_ETC_EXPORTS type "; then
-    log "$PATH_FILE_ETC_EXPORTS already exists in the container"
+    log "$PATH_FILE_ETC_EXPORTS is bind-mounted"
+    return
+  fi
+
+  # maybe it's baked-in to the image
+  if [[ -f $PATH_FILE_ETC_EXPORTS && -r $PATH_FILE_ETC_EXPORTS && -s $PATH_FILE_ETC_EXPORTS ]]; then
+    log "$PATH_FILE_ETC_EXPORTS is baked into the image"
     return
   fi