Better Docker support #277

Merged
blacklight merged 66 commits from 276/better-docker into master 2023-09-04 02:49:15 +02:00
3 changed files with 3 additions and 4 deletions
Showing only changes of commit 1825b492b3 - Show all commits

View File

@ -498,8 +498,7 @@ class Config:
return cfg
@classmethod
@property
def workdir(cls) -> str:
def get_workdir(cls) -> str:
"""
:return: The path of the configured working directory.
"""

View File

@ -117,7 +117,7 @@ class XmppPlugin(AsyncRunnablePlugin, XmppBasePlugin):
auto_accept_invites=auto_accept_invites,
restore_state=restore_state,
state_file=os.path.expanduser(
state_file or os.path.join(Config.workdir, 'xmpp', 'state.json')
state_file or os.path.join(Config.get_workdir(), 'xmpp', 'state.json')
),
)
self._loaded_state = SerializedState()

View File

@ -523,7 +523,7 @@ def get_or_generate_jwt_rsa_key_pair():
"""
from platypush.config import Config
key_dir = os.path.join(Config.workdir, 'jwt')
key_dir = os.path.join(Config.get_workdir(), 'jwt')
priv_key_file = os.path.join(key_dir, 'id_rsa')
pub_key_file = priv_key_file + '.pub'