From 2a379093415e9082ac66f8e8dfb1d4ce1b7d681e Mon Sep 17 00:00:00 2001 From: Arthur de Moulins Date: Wed, 24 Jun 2020 17:20:34 +0200 Subject: [PATCH] change plugin delimiter --- README.md | 9 ++++++--- docker/phraseanet/plugins/InstallCommand.php | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index c311851856..8bc90f4d11 100644 --- a/README.md +++ b/README.md @@ -193,17 +193,20 @@ XDEBUG_REMOTE_HOST=host.docker.internal Plugins can be installed during build if you set the `PHRASEANET_PLUGINS` env var as follows: ```bash -PHRASEANET_PLUGINS="git@github.com:alchemy-fr/Phraseanet-plugin-webgallery.git" +PHRASEANET_PLUGINS="https://github.com/alchemy-fr/Phraseanet-plugin-expose.git" # You can optionally precise the branch to install # If not precised, the main branch will be pulled PHRASEANET_PLUGINS="git@github.com:alchemy-fr/Phraseanet-plugin-webgallery.git(custom-branch)" -# Plugins are separated by spaces -PHRASEANET_PLUGINS="git@github.com:foo/bar.git(branch-1) git@github.com:baz/42.git" +# Plugins are separated by semicolons +PHRASEANET_PLUGINS="git@github.com:foo/bar.git(branch-1);git@github.com:baz/42.git" ``` +> Prefer the HTTPS URL for public repositories, you will not be required to provide your SSH key. + If you install private plugins, make sure you export your SSH private key content in order to allow docker build to access the GIT repository: +Also ensure you're using the SSH URL form (i.e: `git@github.com:alchemy-fr/repo.git`). ```bash export PHRASEANET_SSH_PRIVATE_KEY=$(cat ~/.ssh/id_rsa) # or if your private key is protected by a passphrase: diff --git a/docker/phraseanet/plugins/InstallCommand.php b/docker/phraseanet/plugins/InstallCommand.php index 7b8a28c4cd..3a0c4bc7e1 100644 --- a/docker/phraseanet/plugins/InstallCommand.php +++ b/docker/phraseanet/plugins/InstallCommand.php @@ -29,7 +29,7 @@ class InstallCommand extends Command mkdir($pluginsDir); } - foreach (explode(' ', $plugins) as $key => $plugin) { + foreach (explode(';', $plugins) as $key => $plugin) { $plugin = trim($plugin); $repo = $plugin; $branch = 'master';