Fix backend env loading order

* env loading moved to cli
* command line args are added last

Author: Pinja Pessi

apluslms_roman/builder.py

@@ -1,4 +1,4 @@
-from os import environ, getuid, getegid, mkdir
+from os import getuid, getegid, mkdir
 from os.path import isdir
 from shutil import rmtree
 
@@ -62,17 +62,9 @@ def __init__(self, backend):
 
 
 class Engine:
-    def __init__(self, backend_class=None, settings=None):
-        backend_name = None
+    def __init__(self, backend_class=None, env=None):
         if backend_class is None:
-            if settings and 'backend' in settings:
-                backend_class = settings['backend']
-                if 'backends' in settings and backend_class in settings['backends']:
-                    backend_name = backend_class
-                    if 'type' in settings['backends'][backend_name]:
-                        backend_class = settings['backends'][backend_name]['type']
-            else:
-                from .backends.docker import DockerBackend as backend_class
+            from .backends.docker import DockerBackend as backend_class
         if isinstance(backend_class, str):
             if '.' not in backend_class:
                 backend_class = BACKENDS.get(backend_class, backend_class)
@@ -82,14 +74,6 @@ def __init__(self, backend_class=None, settings=None):
                 raise BackendError(backend_class)
         self._backend_class = backend_class
 
-        name = getattr(backend_class, 'name', None) or backend_class.__name__
-        env_prefix = name.upper() + '_'
-        env = {k: v for k, v in environ.items() if k.startswith(env_prefix)}
-        if backend_name is not None:
-            env.update({env_prefix + k.replace('-', '_').upper(): v
-                for k, v in settings['backends'][backend_name].items()
-                if k != 'type'})
-
         self._environment = Environment(getuid(), getegid(), env)
 
     @cached_property

apluslms_roman/cli.py

@@ -4,7 +4,7 @@
 from functools import partial
 from glob import glob
 from itertools import chain
-from os import chdir, getcwd
+from os import chdir, environ, getcwd
 from os.path import abspath, expanduser, expandvars, join as path_join
 from sys import exit as _exit, stderr, stdout
 
@@ -364,8 +364,33 @@ def main(*, args=None):
 # action utils
 
 def get_engine(context):
+    settings = context.settings
+    backend_class = backend_name = None
+    if 'backend' in settings:
+        backend_class = settings['backend']
+        if 'backends' in settings and backend_class in settings['backends']:
+            backend_name = backend_class
+            if 'type' in settings['backends'][backend_name]:
+                backend_class = settings['backends'][backend_name]['type']
+    if not backend_class:
+        backend_class = 'docker'
+
+    env_prefix = backend_class.upper() + '_'
+    env = {}
+    # config
+    if backend_name is not None:
+        env.update({env_prefix + k.replace('-', '_').upper(): v
+            for k, v in settings['backends'][backend_name].items()
+            if k != 'type'})
+    # environment
+    env.update({k: v for k, v in environ.items() if k.startswith(env_prefix)})
+    # command line
+    if backend_class == 'docker' and 'docker' in settings:
+        env.update({env_prefix + k.replace('-', '_').upper(): v
+            for k, v in settings['docker'].items()})
+
     try:
-        return Engine(settings=context.settings)
+        return Engine(backend_class, env)
     except BackendError as err:
         exit(1, _("ERROR: Unable to find backend '{}'.").format(err.backend))