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

Use correct docker image.

Browse source
This commit is contained in:
SamTV12345 2023-10-02 19:46:59 +02:00
parent d342b83b49
commit 752c0fa063
No known key found for this signature in database
GPG key ID: E63EEC7466038043
4 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.github/workflows/frontend-admin-tests.yml vendored
View file

@ -16,7 +16,7 @@ jobs:
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
node: [19, 20] node: [1.0.3, canary]
steps: steps:
- -
@ -31,7 +31,7 @@ jobs:
- -
uses: oven-sh/setup-bun@v1 uses: oven-sh/setup-bun@v1
with: with:
bun-version: latest bun-version: ${{ matrix.node }}
- -
name: Install etherpad plugins name: Install etherpad plugins
# We intentionally install an old ep_align version to test upgrades to # We intentionally install an old ep_align version to test upgrades to

2
.github/workflows/load-test.yml vendored
View file

@ -57,7 +57,7 @@ jobs:
# The --legacy-peer-deps flag is required to work around a bug in npm v7: # The --legacy-peer-deps flag is required to work around a bug in npm v7:
# https://github.com/npm/cli/issues/2199 # https://github.com/npm/cli/issues/2199
run: > run: >
bun install --no-save --legacy-peer-deps cd src && bun install --no-save --legacy-peer-deps
ep_align ep_align
ep_author_hover ep_author_hover
ep_cursortrace ep_cursortrace

2
Dockerfile
View file

@ -4,7 +4,7 @@
# #
# Author: muxator # Author: muxator
FROM oven/bun:latest FROM oven/bun:alpine
LABEL maintainer="Etherpad team, https://github.com/ether/etherpad-lite" LABEL maintainer="Etherpad team, https://github.com/ether/etherpad-lite"
ARG TIMEZONE= ARG TIMEZONE=

2
src/static/js/pluginfw/plugins.js
View file

@ -111,7 +111,7 @@ exports.getPackages = async () => {
// * The `--no-production` flag is required (or the `NODE_ENV` environment variable must be // * The `--no-production` flag is required (or the `NODE_ENV` environment variable must be
// unset or set to `development`) because otherwise `npm ls` will not mention any packages // unset or set to `development`) because otherwise `npm ls` will not mention any packages
// that are not included in `package.json` (which is expected to not exist). // that are not included in `package.json` (which is expected to not exist).
const cmd = ['npm', 'ls', '--long', '--json', '--depth=0', '--no-production']; const cmd = ['bun', 'ls', '--long', '--json', '--depth=0', '--no-production'];
const {dependencies = {}} = JSON.parse(await runCmd(cmd, {stdio: [null, 'string']})); const {dependencies = {}} = JSON.parse(await runCmd(cmd, {stdio: [null, 'string']}));
await Promise.all(Object.entries(dependencies).map(async ([pkg, info]) => { await Promise.all(Object.entries(dependencies).map(async ([pkg, info]) => {
if (!pkg.startsWith(exports.prefix)) { if (!pkg.startsWith(exports.prefix)) {