Version 1.4

Author: btr1975

Dockerfile

@@ -1,11 +1,11 @@
 # Base Apache2 Server for Running Django Apps - this file is for docker hub auto build
-FROM btr1975/apache-py2-django:1.2
+FROM ubuntu:16.04
 
 LABEL maintainer="e_ben_75-python@yahoo.com" \
       important-stopping-note="Stop the server by running apache2ctl stop, this will keep from process hang" \
       description="This is a base Apache2, Python 2.7.12, Python MySQL-python, and mod_wsgi web server for Django." \
       package-name="apache-py2-django" \
-      image-version="1.3" \
+      image-version="1.4" \
       django-version="1.11.2" \
       django-localflavor-version="1.5.1" \
       mysql-python-version="1.2.5"
@@ -15,21 +15,33 @@ LABEL maintainer="e_ben_75-python@yahoo.com" \
 COPY ./apache-site-conf.sh /bin/
 COPY ./apache-site-conf.py /bin/
 
-# Arguments for Apache conf file builder script if not used, they will use default settings
-# Also it will only allow them if there is only one site directory if there
-# is more it will use default, and you will need to modify manually
-# SITE_SERVER_NAME = ServerName
-# SITE_SERVER_ADMIN = ServerAdmin
-
-ARG SITE_SERVER_NAME
-ARG SITE_SERVER_ADMIN
+# Environment variables for Apache conf file builder script if not used, they will use default settings
+# SITE_SERVER_NAME=www.example.com
+# SITE_SERVER_ADMIN=webmaster@localhost
+# SITE_DIRECTORY_NAME=MySiteDir
+ENV SITE_SERVER_NAME=www.example.com
+ENV SITE_SERVER_ADMIN=webmaster@localhost
+ENV SITE_DIRECTORY_NAME=MySiteDir
 
 # Directory where Django Sites go
 
 WORKDIR /DjangoSites
 
 RUN chmod 755 /bin/apache-site-conf.sh \
     && chmod 755 /bin/apache-site-conf.py
+    apt-get update && apt-get install -y apache2 \
+    python \
+    python-pip \
+    python-dev \
+    libmysqlclient-dev \
+    libapache2-mod-wsgi \
+    && apt-get clean \
+    && mkdir /DjangoSites \
+    && chmod 755 /DjangoSites \
+    && pip install --upgrade pip \
+    && pip install Django==1.11.2 \
+    && pip install django-localflavor==1.5.1 \
+    && pip install MySQL-python
 
 EXPOSE 80 443
 

README.md

@@ -39,14 +39,46 @@ This image is for Python Django Apps written in Python 2
 * apache-site-conf.py: 1.0.1.prod
 * apache-site-conf.sh: 1.0 prod
 
+### Image Versions in apache-py2-django:1.4
+
+* Added ENV SITE_DIRECTORY_NAME, to bot conf build scripts, to helb build easier
+
 ### Docker-Image Version Tags
 * latest
 * 1.1
 * 1.2
 * 1.3
+* 1.4
 
 #### -- Version News: apache-py2-django:1.3 --
 Updated Python script that builds the apache conf file
 Added a bash script that builds the apache conf file
 Both scripts do the same thing, so use whichever you want.
 
+### Important usage info
+```
+There are 3 important ENV varibales you should use when using this
+
+ENV SITE_SERVER_NAME
+ENV SITE_SERVER_ADMIN
+ENV SITE_DIRECTORY_NAME
+
+Set these befor running the apache-site-conf.py, or apache-site-conf.sh script.
+
+```
+
+### Example Dockerfile
+```yaml
+FROM btr1975/apache-py2-django:1.4
+
+ENV SITE_SERVER_NAME="www.example.com"
+ENV SITE_SERVER_ADMIN="admin@example.com"
+ENV SITE_DIRECTORY_NAME="SomeDir"
+
+COPY ./SomeDir .
+
+RUN chmod 755 -R /DjangoSites \
+    && /bin/apache-site-conf.sh
+
+```
+

apache-site-conf.py

@@ -127,9 +127,13 @@ def main():
     """
     dir_count = count_dir()
 
-    for item_name in os.listdir(os.getcwd()):
-        if os.path.isdir(item_name):
-            create_conf(item_name, dir_count)
+    if os.environ.get('SITE_DIRECTORY_NAME'):
+        create_conf(os.environ.get('SITE_DIRECTORY_NAME'), 1)
+
+    else:
+        for item_name in os.listdir(os.getcwd()):
+            if os.path.isdir(item_name):
+                create_conf(item_name, dir_count)
 
     sub.call('a2dissite 000-default.conf > /dev/null', stderr=sub.STDOUT, shell=True)
 

apache-site-conf.sh

@@ -25,7 +25,8 @@ if [[ -f "/etc/apache2/sites-enabled/000-default.conf" ]]; then
     a2dissite 000-default.conf > /dev/null
 fi
 
-for directory in $(ls $djangodirname); do
+# apache_conf Funtion
+apache_conf () {
     if [[ -d $djangodirname/$directory ]]; then
         apacheconfname="${directory,,}.conf"
         if [[ ! -f "$apachedirname/$apacheconfname" ]]; then
@@ -93,4 +94,17 @@ for directory in $(ls $djangodirname); do
 
         fi
     fi
-done
+}
+
+if [[ -n "$SITE_DIRECTORY_NAME" ]]; then
+    directory=$SITE_DIRECTORY_NAME
+    apache_conf
+    
+else
+
+    for directory in $(ls $djangodirname); do
+        apache_conf
+
+    done
+
+fi

from-scratch-dockerfile

@@ -38,12 +38,11 @@ COPY  ./apache-site-conf.py /bin/
 
 RUN chmod 755 /bin/apache-site-conf.py
 
-# Arguments for Apache conf file builder script if not used, they will use default settings
-# SITE_SERVER_NAME = ServerName
-# SITE_SERVER_ADMIN = ServerAdmin
-
-ARG SITE_SERVER_NAME
-ARG SITE_SERVER_ADMIN
+# Environment variables for Apache conf file builder script if not used, they will use default settings
+# SITE_SERVER_NAME=www.example.com
+# SITE_SERVER_ADMIN=webmaster@localhost
+ENV SITE_SERVER_NAME=www.example.com
+ENV SITE_SERVER_ADMIN=webmaster@localhost
 
 # Directory where Django Sites go
 
@@ -59,3 +58,10 @@ LABEL image-version="1.3"
 COPY ./apache-site-conf.sh /bin/
 
 RUN chmod 755 /bin/apache-site-conf.sh
+
+FROM temp3 as temp4
+
+LABEL image-version="1.4"
+
+# SITE_DIRECTORY_NAME = MySiteDir
+ENV SITE_DIRECTORY_NAME=MySiteDir