Skip to content
Snippets Groups Projects
Verified Commit ca762687 authored by Quentin Duchemin's avatar Quentin Duchemin
Browse files

[Etherpad] Fix bad path when building landing page

parent 75d6cbc1
No related branches found
No related tags found
No related merge requests found
Pipeline #60387 waiting for manual action
...@@ -23,7 +23,7 @@ RUN apt-get update && \ ...@@ -23,7 +23,7 @@ RUN apt-get update && \
pkg-config \ pkg-config \
python \ python \
unzip && \ unzip && \
mkdir -p /opt/etherpad-lite mkdir -p /opt/etherpad-lite/
WORKDIR /opt/etherpad-lite WORKDIR /opt/etherpad-lite
# Install Etherpad # Install Etherpad
...@@ -31,13 +31,15 @@ RUN curl -SL https://github.com/ether/etherpad-lite/archive/${ETHERPAD_VERSION_B ...@@ -31,13 +31,15 @@ RUN curl -SL https://github.com/ether/etherpad-lite/archive/${ETHERPAD_VERSION_B
unzip etherpad && \ unzip etherpad && \
rm -Rf etherpad.zip etherpad-lite-${ETHERPAD_VERSION_BUILD}/.git && \ rm -Rf etherpad.zip etherpad-lite-${ETHERPAD_VERSION_BUILD}/.git && \
mv etherpad-lite-${ETHERPAD_VERSION_BUILD}/* . && \ mv etherpad-lite-${ETHERPAD_VERSION_BUILD}/* . && \
bin/installDeps.sh && \ bin/installDeps.sh
COPY ./landing-page ./src/templates/landing-page
# Build and replace landing page # Build and replace landing page
RUN npm install minify && \ RUN npm install minify && \
/builds/$CI_PROJECT_PATH/landing-page/build/build.sh && \ ./src/templates/landing-page/build/build.sh && \
cp /builds/$CI_PROJECT_PATH/landing-page/index.html src/templates/index.html && \ cp ./src/templates/landing-page/index.html src/templates/index.html && \
cp -r /builds/$CI_PROJECT_PATH/landing-page/static/* src/static/ cp -r ./src/templates/landing-page/static/* src/static/
# Install plugins # Install plugins
RUN for PLUGIN_NAME in ${ETHERPAD_PLUGINS}; do npm install "${PLUGIN_NAME}"; done && \ RUN for PLUGIN_NAME in ${ETHERPAD_PLUGINS}; do npm install "${PLUGIN_NAME}"; done && \
......
...@@ -25,8 +25,8 @@ if [ ! $MINIFY ]; then ...@@ -25,8 +25,8 @@ if [ ! $MINIFY ]; then
MINIFY=$(command -v minify.js) || true MINIFY=$(command -v minify.js) || true
fi fi
if [ -f ../node_modules/minify/bin/minify.js ]; then if [ -f /opt/etherpad-lite/node_modules/minify/bin/minify.js ]; then
MINIFY="../node_modules/minify/bin/minify.js" MINIFY="/opt/etherpad-lite/node_modules/minify/bin/minify.js"
fi fi
# If there are missing dependencies, print install instructions # If there are missing dependencies, print install instructions
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment