diff options
author | Chocobozzz <me@florianbigard.com> | 2022-03-08 11:28:32 +0100 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2022-03-08 11:28:32 +0100 |
commit | 7b51ede977c299a74728171d8c124bcc4cbba6ea (patch) | |
tree | ad189d2ed1f987e2053201166af4e953c46529f5 /support | |
parent | ab4b8974997777373a6032073f9c1aaf33ba9931 (diff) | |
parent | 70f3012acd239be4567d9d9fa0364be75485ad1c (diff) | |
download | PeerTube-7b51ede977c299a74728171d8c124bcc4cbba6ea.tar.gz PeerTube-7b51ede977c299a74728171d8c124bcc4cbba6ea.tar.zst PeerTube-7b51ede977c299a74728171d8c124bcc4cbba6ea.zip |
Merge branch 'release/4.1.0' into develop
Diffstat (limited to 'support')
-rw-r--r-- | support/doc/development/tests.md | 8 | ||||
-rw-r--r-- | support/docker/production/Dockerfile.bullseye | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/support/doc/development/tests.md b/support/doc/development/tests.md index 02fc41147..47602156c 100644 --- a/support/doc/development/tests.md +++ b/support/doc/development/tests.md | |||
@@ -31,6 +31,12 @@ $ sudo docker run -p 9444:9000 chocobozzz/s3-ninja | |||
31 | $ sudo docker run -p 10389:10389 chocobozzz/docker-test-openldap | 31 | $ sudo docker run -p 10389:10389 chocobozzz/docker-test-openldap |
32 | ``` | 32 | ``` |
33 | 33 | ||
34 | Ensure you also have these commands: | ||
35 | |||
36 | ``` | ||
37 | $ exiftool --help | ||
38 | ``` | ||
39 | |||
34 | ### Test | 40 | ### Test |
35 | 41 | ||
36 | To run all test suites: | 42 | To run all test suites: |
@@ -39,7 +45,7 @@ To run all test suites: | |||
39 | $ npm run test # See scripts/test.sh to run a particular suite | 45 | $ npm run test # See scripts/test.sh to run a particular suite |
40 | ``` | 46 | ``` |
41 | 47 | ||
42 | Most of tests can be runned using: | 48 | Most of tests can be run using: |
43 | 49 | ||
44 | ```bash | 50 | ```bash |
45 | TS_NODE_TRANSPILE_ONLY=true npm run mocha -- --timeout 30000 --exit -r ts-node/register -r tsconfig-paths/register --bail server/tests/api/videos/video-transcoder.ts | 51 | TS_NODE_TRANSPILE_ONLY=true npm run mocha -- --timeout 30000 --exit -r ts-node/register -r tsconfig-paths/register --bail server/tests/api/videos/video-transcoder.ts |
diff --git a/support/docker/production/Dockerfile.bullseye b/support/docker/production/Dockerfile.bullseye index e55da3307..c57b878ee 100644 --- a/support/docker/production/Dockerfile.bullseye +++ b/support/docker/production/Dockerfile.bullseye | |||
@@ -2,7 +2,7 @@ FROM node:14-bullseye-slim | |||
2 | 2 | ||
3 | # Install dependencies | 3 | # Install dependencies |
4 | RUN apt update \ | 4 | RUN apt update \ |
5 | && apt install -y --no-install-recommends openssl ffmpeg python3 ca-certificates gnupg gosu build-essential curl \ | 5 | && apt install -y --no-install-recommends openssl ffmpeg python3 ca-certificates gnupg gosu build-essential curl git \ |
6 | && gosu nobody true \ | 6 | && gosu nobody true \ |
7 | && rm /var/lib/apt/lists/* -fR | 7 | && rm /var/lib/apt/lists/* -fR |
8 | 8 | ||