Only write plugins to json file in Dockerfile
parent
4987443f79
commit
9d60965980
14
Dockerfile
14
Dockerfile
|
@ -90,18 +90,8 @@ WORKDIR "${EP_DIR}"
|
||||||
|
|
||||||
COPY --chown=etherpad:etherpad ./ ./
|
COPY --chown=etherpad:etherpad ./ ./
|
||||||
|
|
||||||
# Plugins must be installed before installing Etherpad's dependencies, otherwise
|
RUN { [ -z "${ETHERPAD_PLUGINS}" ] || /bin/bash -c 'ARR_PLUGINS=($ETHERPAD_PLUGINS) && jq -n "{plugins: \$ARGS.positional}" --args ${ARR_PLUGINS[@]} > var/installed_plugins.json'; } && \
|
||||||
# npm will try to hoist common dependencies by removing them from
|
src/bin/installDeps.sh &&
|
||||||
# src/node_modules and installing them in the top-level node_modules. As of
|
|
||||||
# v6.14.10, npm's hoist logic appears to be buggy, because it sometimes removes
|
|
||||||
# dependencies from src/node_modules but fails to add them to the top-level
|
|
||||||
# node_modules. Even if npm correctly hoists the dependencies, the hoisting
|
|
||||||
# seems to confuse tools such as `npm outdated`, `npm update`, and some ESLint
|
|
||||||
# rules.
|
|
||||||
RUN { [ -z "${ETHERPAD_PLUGINS}" ] || \
|
|
||||||
npm install --no-save --legacy-peer-deps ${ETHERPAD_PLUGINS}; } && \
|
|
||||||
src/bin/installDeps.sh && \
|
|
||||||
rm -rf ~/.npm
|
|
||||||
|
|
||||||
# Copy the configuration file.
|
# Copy the configuration file.
|
||||||
COPY --chown=etherpad:etherpad ${SETTINGS} "${EP_DIR}"/settings.json
|
COPY --chown=etherpad:etherpad ${SETTINGS} "${EP_DIR}"/settings.json
|
||||||
|
|
|
@ -65,7 +65,9 @@ exports.checkForMigration = async () => {
|
||||||
const installedPlugins = JSON.parse(fileContent.toString());
|
const installedPlugins = JSON.parse(fileContent.toString());
|
||||||
|
|
||||||
for (const plugin of installedPlugins.plugins) {
|
for (const plugin of installedPlugins.plugins) {
|
||||||
await exports.manager.install(plugin)
|
if (plugin.startsWith(plugins.prefix) && plugin !== 'ep_etherpad-lite') {
|
||||||
|
await exports.manager.install(plugin)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue