etherpad: Use minideb-node, since it appears to work now?
This commit is contained in:
parent
53eba84b4f
commit
657c7d56e0
1 changed files with 11 additions and 10 deletions
|
@ -17,28 +17,29 @@ RUN mkdir -p /srv \
|
||||||
|
|
||||||
###############################################################################
|
###############################################################################
|
||||||
|
|
||||||
FROM ${REPO_LOCATION}minideb
|
FROM ${REPO_LOCATION}minideb-node
|
||||||
|
|
||||||
COPY --from=builder /srv/etherpad /srv/etherpad
|
COPY --from=builder /srv/etherpad /srv/etherpad
|
||||||
COPY settings.json /srv/etherpad/
|
COPY settings.json /srv/etherpad/
|
||||||
|
|
||||||
ENV NVM_DIR /root/.nvm
|
# ENV NVM_DIR /root/.nvm
|
||||||
ENV NODE_VERSION lts/erbium
|
# ENV NODE_VERSION lts/erbium
|
||||||
|
|
||||||
# lts-erbium = Node.js 12.x
|
# lts-erbium = Node.js 12.x
|
||||||
# We speculate that our problems with Etherpad are because we're using a newer version of Node.js..... :-/
|
# We speculate that our problems with Etherpad are because we're using a newer version of Node.js..... :-/
|
||||||
# nvm needs curl to download versions of Node.js
|
# nvm needs curl to download versions of Node.js
|
||||||
# Ref https://stackoverflow.com/a/66521281/1460422
|
# Ref https://stackoverflow.com/a/66521281/1460422
|
||||||
|
|
||||||
|
# mkdir -p /.npm \
|
||||||
|
# && chmod +x $HOME/.nvm/nvm.sh \
|
||||||
|
# && . $HOME/.nvm/nvm.sh \
|
||||||
|
# && nvm install $NODE_VERSION \
|
||||||
|
# && nvm alias default $NODE_VERSION \
|
||||||
|
# && nvm use default \
|
||||||
|
|
||||||
RUN install_packages ca-certificates curl
|
RUN install_packages ca-certificates curl
|
||||||
RUN curl -sSL -o - https://raw.githubusercontent.com/nvm-sh/nvm/v0.38.0/install.sh | bash || true
|
RUN curl -sSL -o - https://raw.githubusercontent.com/nvm-sh/nvm/v0.38.0/install.sh | bash || true
|
||||||
RUN mkdir -p /.npm \
|
RUN cd /srv/etherpad \
|
||||||
&& chmod +x $HOME/.nvm/nvm.sh \
|
|
||||||
&& . $HOME/.nvm/nvm.sh \
|
|
||||||
&& nvm install $NODE_VERSION \
|
|
||||||
&& nvm alias default $NODE_VERSION \
|
|
||||||
&& nvm use default \
|
|
||||||
&& cd /srv/etherpad \
|
|
||||||
&& install_packages python3 make sqlite3 libsqlite3-dev gcc g++ libc-dev libc++-dev \
|
&& install_packages python3 make sqlite3 libsqlite3-dev gcc g++ libc-dev libc++-dev \
|
||||||
&& ln -s /usr/bin/python3 /usr/bin/python \
|
&& ln -s /usr/bin/python3 /usr/bin/python \
|
||||||
&& src/bin/installDeps.sh \
|
&& src/bin/installDeps.sh \
|
||||||
|
|
Loading…
Reference in a new issue