diff options
author | Chocobozzz <me@florianbigard.com> | 2022-01-03 11:01:39 +0100 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2022-01-03 14:20:56 +0100 |
commit | b18a501a0ee898aeb2e34b92de61e682a1894547 (patch) | |
tree | 2984c5b9e341c3433dd639d07cc6d250776dbae6 | |
parent | cc4bf76c13e38e9065d49161b6e0485657424577 (diff) | |
download | PeerTube-b18a501a0ee898aeb2e34b92de61e682a1894547.tar.gz PeerTube-b18a501a0ee898aeb2e34b92de61e682a1894547.tar.zst PeerTube-b18a501a0ee898aeb2e34b92de61e682a1894547.zip |
Try to fix docker build
-rw-r--r-- | server/tests/api/server/proxy.ts | 4 | ||||
-rw-r--r-- | server/tests/api/videos/multiple-servers.ts | 20 | ||||
-rw-r--r-- | support/docker/production/Dockerfile.bullseye | 4 |
3 files changed, 14 insertions, 14 deletions
diff --git a/server/tests/api/server/proxy.ts b/server/tests/api/server/proxy.ts index c40a4f9b8..2a8ff56d2 100644 --- a/server/tests/api/server/proxy.ts +++ b/server/tests/api/server/proxy.ts | |||
@@ -96,7 +96,7 @@ describe('Test proxy', function () { | |||
96 | } | 96 | } |
97 | 97 | ||
98 | it('Should succeed import with the appropriate proxy config', async function () { | 98 | it('Should succeed import with the appropriate proxy config', async function () { |
99 | this.timeout(40000) | 99 | this.timeout(120000) |
100 | 100 | ||
101 | await servers[0].kill() | 101 | await servers[0].kill() |
102 | await servers[0].run({}, { env: goodEnv }) | 102 | await servers[0].run({}, { env: goodEnv }) |
@@ -111,7 +111,7 @@ describe('Test proxy', function () { | |||
111 | }) | 111 | }) |
112 | 112 | ||
113 | it('Should fail import with a wrong proxy config', async function () { | 113 | it('Should fail import with a wrong proxy config', async function () { |
114 | this.timeout(40000) | 114 | this.timeout(120000) |
115 | 115 | ||
116 | await servers[0].kill() | 116 | await servers[0].kill() |
117 | await servers[0].run({}, { env: badEnv }) | 117 | await servers[0].run({}, { env: badEnv }) |
diff --git a/server/tests/api/videos/multiple-servers.ts b/server/tests/api/videos/multiple-servers.ts index 9fa03f1a9..ecdd36613 100644 --- a/server/tests/api/videos/multiple-servers.ts +++ b/server/tests/api/videos/multiple-servers.ts | |||
@@ -380,7 +380,7 @@ describe('Test multiple servers', function () { | |||
380 | 380 | ||
381 | describe('Should seed the uploaded video', function () { | 381 | describe('Should seed the uploaded video', function () { |
382 | it('Should add the file 1 by asking server 3', async function () { | 382 | it('Should add the file 1 by asking server 3', async function () { |
383 | this.timeout(10000) | 383 | this.timeout(30000) |
384 | 384 | ||
385 | const { data } = await servers[2].videos.list() | 385 | const { data } = await servers[2].videos.list() |
386 | 386 | ||
@@ -396,7 +396,7 @@ describe('Test multiple servers', function () { | |||
396 | }) | 396 | }) |
397 | 397 | ||
398 | it('Should add the file 2 by asking server 1', async function () { | 398 | it('Should add the file 2 by asking server 1', async function () { |
399 | this.timeout(10000) | 399 | this.timeout(30000) |
400 | 400 | ||
401 | const { data } = await servers[0].videos.list() | 401 | const { data } = await servers[0].videos.list() |
402 | 402 | ||
@@ -410,7 +410,7 @@ describe('Test multiple servers', function () { | |||
410 | }) | 410 | }) |
411 | 411 | ||
412 | it('Should add the file 3 by asking server 2', async function () { | 412 | it('Should add the file 3 by asking server 2', async function () { |
413 | this.timeout(10000) | 413 | this.timeout(30000) |
414 | 414 | ||
415 | const { data } = await servers[1].videos.list() | 415 | const { data } = await servers[1].videos.list() |
416 | 416 | ||
@@ -424,7 +424,7 @@ describe('Test multiple servers', function () { | |||
424 | }) | 424 | }) |
425 | 425 | ||
426 | it('Should add the file 3-2 by asking server 1', async function () { | 426 | it('Should add the file 3-2 by asking server 1', async function () { |
427 | this.timeout(10000) | 427 | this.timeout(30000) |
428 | 428 | ||
429 | const { data } = await servers[0].videos.list() | 429 | const { data } = await servers[0].videos.list() |
430 | 430 | ||
@@ -438,7 +438,7 @@ describe('Test multiple servers', function () { | |||
438 | }) | 438 | }) |
439 | 439 | ||
440 | it('Should add the file 2 in 360p by asking server 1', async function () { | 440 | it('Should add the file 2 in 360p by asking server 1', async function () { |
441 | this.timeout(10000) | 441 | this.timeout(30000) |
442 | 442 | ||
443 | const { data } = await servers[0].videos.list() | 443 | const { data } = await servers[0].videos.list() |
444 | 444 | ||
@@ -595,7 +595,7 @@ describe('Test multiple servers', function () { | |||
595 | let updatedAtMin: Date | 595 | let updatedAtMin: Date |
596 | 596 | ||
597 | it('Should update video 3', async function () { | 597 | it('Should update video 3', async function () { |
598 | this.timeout(10000) | 598 | this.timeout(30000) |
599 | 599 | ||
600 | const attributes = { | 600 | const attributes = { |
601 | name: 'my super video updated', | 601 | name: 'my super video updated', |
@@ -618,7 +618,7 @@ describe('Test multiple servers', function () { | |||
618 | }) | 618 | }) |
619 | 619 | ||
620 | it('Should have the video 3 updated on each server', async function () { | 620 | it('Should have the video 3 updated on each server', async function () { |
621 | this.timeout(10000) | 621 | this.timeout(30000) |
622 | 622 | ||
623 | for (const server of servers) { | 623 | for (const server of servers) { |
624 | const { data } = await server.videos.list() | 624 | const { data } = await server.videos.list() |
@@ -669,7 +669,7 @@ describe('Test multiple servers', function () { | |||
669 | }) | 669 | }) |
670 | 670 | ||
671 | it('Should only update thumbnail and update updatedAt attribute', async function () { | 671 | it('Should only update thumbnail and update updatedAt attribute', async function () { |
672 | this.timeout(10000) | 672 | this.timeout(30000) |
673 | 673 | ||
674 | const attributes = { | 674 | const attributes = { |
675 | thumbnailfile: 'thumbnail.jpg' | 675 | thumbnailfile: 'thumbnail.jpg' |
@@ -861,7 +861,7 @@ describe('Test multiple servers', function () { | |||
861 | }) | 861 | }) |
862 | 862 | ||
863 | it('Should delete a reply', async function () { | 863 | it('Should delete a reply', async function () { |
864 | this.timeout(10000) | 864 | this.timeout(30000) |
865 | 865 | ||
866 | await servers[2].comments.delete({ videoId: videoUUID, commentId: childOfFirstChild.comment.id }) | 866 | await servers[2].comments.delete({ videoId: videoUUID, commentId: childOfFirstChild.comment.id }) |
867 | 867 | ||
@@ -892,7 +892,7 @@ describe('Test multiple servers', function () { | |||
892 | }) | 892 | }) |
893 | 893 | ||
894 | it('Should delete the thread comments', async function () { | 894 | it('Should delete the thread comments', async function () { |
895 | this.timeout(10000) | 895 | this.timeout(30000) |
896 | 896 | ||
897 | const { data } = await servers[0].comments.listThreads({ videoId: videoUUID }) | 897 | const { data } = await servers[0].comments.listThreads({ videoId: videoUUID }) |
898 | const commentId = data.find(c => c.text === 'my super first comment').id | 898 | const commentId = data.find(c => c.text === 'my super first comment').id |
diff --git a/support/docker/production/Dockerfile.bullseye b/support/docker/production/Dockerfile.bullseye index ec0e30e47..6cb1a4e5f 100644 --- a/support/docker/production/Dockerfile.bullseye +++ b/support/docker/production/Dockerfile.bullseye | |||
@@ -21,10 +21,10 @@ WORKDIR /app | |||
21 | 21 | ||
22 | USER peertube | 22 | USER peertube |
23 | 23 | ||
24 | RUN yarn install --pure-lockfile --network-timeout 1200000 \ | 24 | RUN yarn install --pure-lockfile --network-timeout 1200000 --network-concurrency 20 \ |
25 | && npm run build -- $NPM_RUN_BUILD_OPTS \ | 25 | && npm run build -- $NPM_RUN_BUILD_OPTS \ |
26 | && rm -r ./node_modules ./client/node_modules \ | 26 | && rm -r ./node_modules ./client/node_modules \ |
27 | && yarn install --pure-lockfile --production --network-timeout 1200000 \ | 27 | && yarn install --pure-lockfile --production --network-timeout 1200000 --network-concurrency 20 \ |
28 | && yarn cache clean | 28 | && yarn cache clean |
29 | 29 | ||
30 | USER root | 30 | USER root |