Skip to content

Support SIYUAN_WORKSPACE_PATH in Docker#14256

Closed
luke-zhu wants to merge 1 commit intosiyuan-note:devfrom
luke-zhu:workspace_space
Closed

Support SIYUAN_WORKSPACE_PATH in Docker#14256
luke-zhu wants to merge 1 commit intosiyuan-note:devfrom
luke-zhu:workspace_space

Conversation

@luke-zhu
Copy link
Copy Markdown
Contributor

@luke-zhu luke-zhu commented Mar 2, 2025

The current entrypoint fails if the user uses
--workspace /my/workspace with a space instead
of an equals.

This change supports that format as well as the
SIYUAN_WORKSPACE_PATH env variable.

SIYUAN_WORKSPACE_PATH=/should/be/ignored ./stuff.sh --workspace /my/workspace --workspace-prefix --fla g-equal=3 --flag-no-equal 4
WORKSPACE_DIR: /my/workspace
ARGS:  --workspace-prefix --flag-equal=3 --flag-no-equal 4

SIYUAN_WORKSPACE_PATH=/my/workspace ./stuff.sh --workspace-prefix --flag-equal=3 --flag-no-equal
4
WORKSPACE_DIR: /siyuan/workspace
ARGS:  --workspace-prefix --flag-equal=3 --flag-no-equal 4

SIYUAN_WORKSPACE_PATH=/should/be/ignored ./stuff.sh --workspace=/my/workspace --workspace-prefix --fla g-equal=3 --flag-no-equal 4
WORKSPACE_DIR: /my/workspace
ARGS:  --workspace-prefix --fla g-equal=3 --flag-no-equal 4

Feature or bug? 特性或者缺陷?

Bug fix

Multilingual or copywriting? 多语言或者文案?

Please submit directly, we will evaluate.
请直接提交,我们会进行评估。

Dev branch!

@github-actions
Copy link
Copy Markdown

github-actions bot commented Mar 2, 2025

Your PR was set to target master, PRs should be target dev
The base branch of this PR has been automatically changed to dev, please check that there are no merge conflicts

@github-actions github-actions bot changed the base branch from master to dev March 2, 2025 08:33
The current entrypoint fails if the user uses
--workspace /my/workspace with a space instead
of an equals.

This change supports that format as well as the
SIYUAN_WORKSPACE_PATH env variable.

SIYUAN_WORKSPACE_PATH=/should/be/ignored ./stuff.sh --workspace /my/workspace --workspace-prefix --fla
g-equal=3 --flag-no-equal 4
WORKSPACE_DIR: /my/workspace
ARGS:  --workspace-prefix --flag-equal=3 --flag-no-equal 4

SIYUAN_WORKSPACE_PATH=/my/workspace ./stuff.sh --w
orkspace-prefix --flag-equal=3 --flag-no-equal
4
WORKSPACE_DIR: /siyuan/workspace
ARGS:  --workspace-prefix --flag-equal=3 --flag-no-equal 4
@88250
Copy link
Copy Markdown
Member

88250 commented Mar 3, 2025

Hi, to maintain consistency with other parameters (using =), this PR is not considered for merging, thank you.

@88250 88250 closed this Mar 3, 2025
@luke-zhu
Copy link
Copy Markdown
Contributor Author

luke-zhu commented Mar 4, 2025

Ok, well you still have the problem if the user uses SIYUAN_WORKSPACE_PATH

@88250
Copy link
Copy Markdown
Member

88250 commented Mar 5, 2025

What you said makes sense. Can we just change SIYUAN_WORKSPACE_PATH support without changing =?

@luke-zhu luke-zhu changed the title Support '--workspace <WORKSPACE_DIR>' and SIYUAN_WORKSPACE_PATH in entrypoint.sh Support SIYUAN_WORKSPACE_PATH in Docker Mar 5, 2025
@luke-zhu
Copy link
Copy Markdown
Contributor Author

luke-zhu commented Mar 5, 2025

Sure, I have updated the commit and the PR title

@luke-zhu
Copy link
Copy Markdown
Contributor Author

luke-zhu commented Mar 5, 2025

#14286

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants