mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-05-08 08:01:02 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Fixed.

Browse source
This commit is contained in:
SamTV12345 2024-02-10 23:02:19 +01:00
parent ae08cd5049
commit 490f960fcf
3 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
.github/workflows/windows.yml vendored
View file

@ -142,15 +142,15 @@ jobs:
- name: Only install direct dependencies - name: Only install direct dependencies
run: pnpm config set auto-install-peers false run: pnpm config set auto-install-peers false
- name: Install all dependencies and symlink for ep_etherpad-lite - name: Install all dependencies and symlink for ep_etherpad-lite
run: src/bin/installDeps.sh run: ./bin/installDeps.sh
working-directory: etherpad working-directory: etherpad/src
- -
name: Run Etherpad name: Run Etherpad
working-directory: etherpad/src working-directory: etherpad/src
run: | run: |
pnpm run prod --prefix ./src pnpm run prod
curl --connect-timeout 10 --max-time 20 --retry 5 --retry-delay 10 --retry-max-time 60 --retry-connrefused http://127.0.0.1:9001/p/test curl --connect-timeout 10 --max-time 20 --retry 5 --retry-delay 10 --retry-max-time 60 --retry-connrefused http://127.0.0.1:9001/p/test
.\node_modules\.bin\cypress run --config-file src\tests\frontendcypress\cypress.config.js pnpm exec cypress run --config-file ../tests/frontend/cypress/cypress.config.js
# On release, upload windows zip to GitHub release tab # On release, upload windows zip to GitHub release tab
- -
name: Rename to etherpad-lite-win.zip name: Rename to etherpad-lite-win.zip

6
Dockerfile
View file

@ -83,6 +83,7 @@ RUN \
apk update && apk upgrade && \ apk update && apk upgrade && \
apk add \ apk add \
ca-certificates \ ca-certificates \
curl \
git \ git \
${INSTALL_ABIWORD:+abiword abiword-plugin-command} \ ${INSTALL_ABIWORD:+abiword abiword-plugin-command} \
${INSTALL_SOFFICE:+libreoffice openjdk8-jre libreoffice-common} ${INSTALL_SOFFICE:+libreoffice openjdk8-jre libreoffice-common}
@ -113,13 +114,12 @@ COPY --chown=etherpad:etherpad ${SETTINGS} "${EP_DIR}"/settings.json
#RUN chmod -R g=u . #RUN chmod -R g=u .
USER root USER root
RUN cd src && npm link
USER etherpad USER etherpad
WORKDIR /opt/etherpad-lite WORKDIR /opt/etherpad-lite
HEALTHCHECK --interval=20s --timeout=3s CMD ["pnpm", "etherpad-healthcheck"] HEALTHCHECK --interval=5s --timeout=3s \
CMD curl --silent http://localhost:9001/health | grep -E "pass|ok|up" > /dev/null || exit 1
EXPOSE 9001 EXPOSE 9001
CMD ["npm", "run", "prod", "--prefix", "./src"] CMD ["npm", "run", "prod", "--prefix", "./src"]

1
src/bin/buildForWindows.sh
View file

@ -34,7 +34,6 @@ try export GIT_WORK_TREE=${TMP_FOLDER}; git checkout HEAD -f \
try mkdir "${TMP_FOLDER}"/.git try mkdir "${TMP_FOLDER}"/.git
try git rev-parse HEAD >${TMP_FOLDER}/.git/HEAD try git rev-parse HEAD >${TMP_FOLDER}/.git/HEAD
# Disable symlinks to avoid problems with Windows # Disable symlinks to avoid problems with Windows
try pnpm config set symlink false
try pnpm i "${TMP_FOLDER}"/src/node_modules try pnpm i "${TMP_FOLDER}"/src/node_modules
try cd "${TMP_FOLDER}" try cd "${TMP_FOLDER}"