Revert previous revision as it causes CI errors and should really go into a new

branch to completely address the state init issues for the included
'production' example.

Author: jonasbardino

Makefile

@@ -87,9 +87,6 @@ initdirs:
 	mkdir -p httpd
 	mkdir -p mig
 	mkdir -p state
-	mkdir -p volatile
-	mkdir -p volatile/mig_system_run
-	mkdir -p volatile/openid_store
 	mkdir -p log/migrid
 	mkdir -p log/migrid-io
 	mkdir -p log/migrid-openid
@@ -190,7 +187,7 @@ clean:
 	[ -L ./certs ] || [ -f ./certs/.persistent ] || rm -fr ./certs
 
 stateclean: warning
-	rm -rf ./state ./volatile
+	rm -rf ./state
 
 # IMPORTANT: this target is meant to reset the dir to a pristine checkout
 #            and thus runs full clean up of even the state dir with user data

development.env

@@ -184,7 +184,7 @@ EXTRA_USERPAGE_STYLES=""
 # sudo mount /storage/tmpfs/mig_system_run
 # NOTE: toggle commenting on  next two lines if you have such a tmpfs set up in the given path
 #MIG_SYSTEM_RUN=/storage/tmpfs/mig_system_run
-MIG_SYSTEM_RUN=${DOCKER_MIGRID_ROOT}/volatile/mig_system_run
+MIG_SYSTEM_RUN=${DOCKER_MIGRID_ROOT}/state/mig_system_run
 # The apache auth openid module performs and scales better if the associated
 # internal openid store directory runs from fast storage. It's a volatile data
 # store, which allows more concurrent OpenID 2.0 clients if it e.g. uses tmpfs.
@@ -193,7 +193,7 @@ MIG_SYSTEM_RUN=${DOCKER_MIGRID_ROOT}/volatile/mig_system_run
 # Otherwise you can safely ignore the OPENID_STORE setting.
 # NOTE: toggle commenting on next two lines if you have such a tmpfs set up in the given path
 #OPENID_STORE=/storage/tmpfs/openid_store
-OPENID_STORE=${DOCKER_MIGRID_ROOT}/volatile/openid_store
+OPENID_STORE=${DOCKER_MIGRID_ROOT}/state/openid_store
 # We need a read-only bind mounted version of the vgrid_files_writable
 # directory and the underlying location can be configured here.
 VGRID_FILES_WRITABLE=${DOCKER_MIGRID_ROOT}/state/vgrid_files_writable

development_gdp.env

@@ -185,7 +185,7 @@ EXTRA_USERPAGE_STYLES=""
 # sudo mount /storage/tmpfs/mig_system_run
 # NOTE: toggle commenting on  next two lines if you have such a tmpfs set up in the given path
 #MIG_SYSTEM_RUN=/storage/tmpfs/mig_system_run
-MIG_SYSTEM_RUN=${DOCKER_MIGRID_ROOT}/volatile/mig_system_run
+MIG_SYSTEM_RUN=${DOCKER_MIGRID_ROOT}/state/mig_system_run
 # The apache auth openid module performs and scales better if the associated
 # internal openid store directory runs from fast storage. It's a volatile data
 # store, which allows more concurrent OpenID 2.0 clients if it e.g. uses tmpfs.
@@ -194,7 +194,7 @@ MIG_SYSTEM_RUN=${DOCKER_MIGRID_ROOT}/volatile/mig_system_run
 # Otherwise you can safely ignore the OPENID_STORE setting.
 # NOTE: toggle commenting on next two lines if you have such a tmpfs set up in the given path
 #OPENID_STORE=/storage/tmpfs/openid_store
-OPENID_STORE=${DOCKER_MIGRID_ROOT}/volatile/openid_store
+OPENID_STORE=${DOCKER_MIGRID_ROOT}/state/openid_store
 # We need a read-only bind mounted version of the vgrid_files_writable
 # directory and the underlying location can be configured here.
 VGRID_FILES_WRITABLE=${DOCKER_MIGRID_ROOT}/state/vgrid_files_writable

production.env

@@ -185,7 +185,7 @@ EXTRA_USERPAGE_STYLES=""
 # sudo mount /storage/tmpfs/mig_system_run
 # NOTE: toggle commenting on  next two lines if you have such a tmpfs set up in the given path
 #MIG_SYSTEM_RUN=/storage/tmpfs/mig_system_run
-MIG_SYSTEM_RUN=${DOCKER_MIGRID_ROOT}/volatile/mig_system_run
+MIG_SYSTEM_RUN=${DOCKER_MIGRID_ROOT}/state/mig_system_run
 # The apache auth openid module performs and scales better if the associated
 # internal openid store directory runs from fast storage. It's a volatile data
 # store, which allows more concurrent OpenID 2.0 clients if it e.g. uses tmpfs.
@@ -194,14 +194,9 @@ MIG_SYSTEM_RUN=${DOCKER_MIGRID_ROOT}/volatile/mig_system_run
 # Otherwise you can safely ignore the OPENID_STORE setting.
 # NOTE: toggle commenting on next two lines if you have such a tmpfs set up in the given path
 #OPENID_STORE=/storage/tmpfs/openid_store
-OPENID_STORE=${DOCKER_MIGRID_ROOT}/volatile/openid_store
+OPENID_STORE=${DOCKER_MIGRID_ROOT}/state/openid_store
 # We need a read-only bind mounted version of the vgrid_files_writable
 # directory and the underlying location can be configured here.
-# If you mount your user data storage on a different location say outside the
-# docker-migrid root you'd want to adjust the value here to also point into
-# that location.
-# NOTE: toggle commenting on next two lines if you have a netfs mount set up in the given path
-#VGRID_FILES_WRITABLE=/storage/netfs/vgrid_files_writable
 VGRID_FILES_WRITABLE=${DOCKER_MIGRID_ROOT}/state/vgrid_files_writable
 
 # Which svn repo and version of migrid should be used