diff --git a/doc/source/developer/docker.rst b/doc/source/developer/docker.rst index af8faa40..15f1630c 100644 --- a/doc/source/developer/docker.rst +++ b/doc/source/developer/docker.rst @@ -47,7 +47,7 @@ Currently reserved env keys: - ``x11-width``: for the VNC images, the X11 width - ``x11-height``: for the VNC images, the X11 height - ``x11-depth``: for the VNC images, the X11 depth (currently unused, fixed at 16) - - ``srdata``: this variable can be set to a file that will be loaded by an application + - ``startupdata``: this variable can be set to a file that will be loaded by an application upon startup Container Labels diff --git a/frontend/user/vue-components/ApplicationView.vue b/frontend/user/vue-components/ApplicationView.vue index 1477e7c8..b352a066 100644 --- a/frontend/user/vue-components/ApplicationView.vue +++ b/frontend/user/vue-components/ApplicationView.vue @@ -49,7 +49,7 @@ :configDict.sync="configurable.configDict">
- diff --git a/remoteappmanager/docker/configurables.py b/remoteappmanager/docker/configurables.py index 3d8e4536..0c5b8cc9 100644 --- a/remoteappmanager/docker/configurables.py +++ b/remoteappmanager/docker/configurables.py @@ -109,7 +109,7 @@ def default_env(cls): class StartupData(Configurable): """ Support opening a specific file when an application starts up. """ - tag = "srdata" + tag = "startupdata" @classmethod def supported_by(cls, image): @@ -119,9 +119,9 @@ def supported_by(cls, image): def config_dict_to_env(cls, config_dict): """ The config dict must contain the tag key, e.g.: - cls.tag = "srdata" + cls.tag = "startupdata" - {"srdata": "/home/user/can.ex2"} + {"startupdata": "/home/user/can.ex2"} """ if config_dict is None or len(config_dict) == 0: return cls.default_env() diff --git a/remoteappmanager/docker/tests/test_configurables.py b/remoteappmanager/docker/tests/test_configurables.py index 5bd6178f..44e4fa9a 100644 --- a/remoteappmanager/docker/tests/test_configurables.py +++ b/remoteappmanager/docker/tests/test_configurables.py @@ -67,15 +67,16 @@ def test_config_dict_to_env_resolution(self): def test_config_dict_to_env_startup_data(self): self.assertEqual( - StartupData.config_dict_to_env({"srdata": "/home/test/can.ex2"}), - {"SRDATA": "/home/test/can.ex2"} + StartupData.config_dict_to_env( + {"startupdata": "/home/test/can.ex2"}), + {"STARTUPDATA": "/home/test/can.ex2"} ) default = StartupData.default_env() - self.assertEqual(default, {"SRDATA": ""}) + self.assertEqual(default, {"STARTUPDATA": ""}) self.assertEqual(StartupData.config_dict_to_env(None), default) self.assertEqual(StartupData.config_dict_to_env({}), default) with self.assertRaises(ValueError): - StartupData.config_dict_to_env({"srdata": 123}) + StartupData.config_dict_to_env({"startupdata": 123}) diff --git a/remoteappmanager/tests/mocking/virtual/docker_client.py b/remoteappmanager/tests/mocking/virtual/docker_client.py index 15f7d607..16724eaf 100644 --- a/remoteappmanager/tests/mocking/virtual/docker_client.py +++ b/remoteappmanager/tests/mocking/virtual/docker_client.py @@ -364,7 +364,7 @@ def _init_available_images(self): SIMPHONY_NS_ENV['x11-width']: '', SIMPHONY_NS_ENV['x11-height']: '', SIMPHONY_NS_ENV['x11-depth']: '', - SIMPHONY_NS_ENV['srdata']: '', + SIMPHONY_NS_ENV['startupdata']: '', }, exposed_ports=["8888/tcp"] )