Use data directory for media files if exists.

Author: GrahamDumpleton

.s2i/action_hooks/deploy

@@ -20,6 +20,16 @@ echo " -----> Current working directory."
 
 pwd
 
+# If necessaary create the media directory if persistent volume being used.
+
+if [ -d /opt/app-root/data ]; then
+    if [ ! -d /opt/app-root/data/media/images ]; then
+        echo " -----> Creating directory for uploaded image files."
+
+        mkdir -p /opt/app-root/data/media/images
+    fi
+fi
+
 # Run the application specific deploy steps for this project. If an
 # external database is being used, only perform the database migration
 # and do not run full setup. When external database is used the setup to

katacoda/settings.py

@@ -16,6 +16,11 @@
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
 BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 
+# If persistent volume mounted, use it for database and media.
+if os.path.isdir('/opt/app-root/data'):
+    DATA_DIR = '/opt/app-root/data'
+else:
+    DATA_DIR = BASE_DIR
 
 # Quick-start development settings - unsuitable for production
 # See https://docs.djangoproject.com/en/1.10/howto/deployment/checklist/
@@ -122,15 +127,10 @@ def database_url():
     }
 
 else:
-    if os.path.isdir('/opt/app-root/data'):
-        DATABASE_DIR = '/opt/app-root/data'
-    else:
-        DATABASE_DIR = BASE_DIR
-
     DATABASES = {
         'default': {
             'ENGINE': 'django.db.backends.sqlite3',
-            'NAME': os.path.join(DATABASE_DIR, 'db.sqlite3'),
+            'NAME': os.path.join(DATA_DIR, 'db.sqlite3'),
         }
     }
 
@@ -175,7 +175,7 @@ def database_url():
 STATIC_ROOT = os.path.join(BASE_DIR, 'static')
 
 MEDIA_URL = '/media/'
-MEDIA_ROOT = os.path.join(BASE_DIR, 'media')
+MEDIA_ROOT = os.path.join(DATA_DIR, 'media')
 
 LOGGING = {
     'version': 1,