dockerfile: moved BIND_DATA_DIR and WEBMIN_DATA_DIR env variables…

… to the `entrypoint.sh` script
einyx · Jun 15, 2015 · 3f5d7c3 · 3f5d7c3
1 parent 9e01ec1
commit 3f5d7c3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -5,9 +5,6 @@ ENV DATA_DIR=/data \
  BIND_USER=bind \
  WEBMIN_VERSION=1.740
 
-ENV BIND_DATA_DIR=${DATA_DIR}/bind \
- WEBMIN_DATA_DIR=${DATA_DIR}/webmin
-
 RUN rm -rf /etc/apt/apt.conf.d/docker-gzip-indexes \
  && apt-get update \
  && apt-get install -y bind9 perl libnet-ssleay-perl openssl \

diff --git a/entrypoint.sh b/entrypoint.sh
@@ -1,8 +1,14 @@
 #!/bin/bash
 set -e
 
+# script variables
+BIND_DATA_DIR=${DATA_DIR}/bind
+WEBMIN_DATA_DIR=${DATA_DIR}/webmin
+
+# configuration variables
 WEBMIN_ENABLED=${WEBMIN_ENABLED:-true}
 
+## ...and here we go
 chmod 775 ${DATA_DIR}
 
 # create directory for bind config