forks
/
peertube
1
0
Fork 0
Code Releases Activity

Try to fix docker build

This commit is contained in:
Chocobozzz 2022-01-03 11:01:39 +01:00
parent cc4bf76c13
commit b18a501a0e
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/tests/api/server/proxy.ts
View File

@ -96,7 +96,7 @@ describe('Test proxy', function () {
} }
it('Should succeed import with the appropriate proxy config', async function () { it('Should succeed import with the appropriate proxy config', async function () {
this.timeout(40000) this.timeout(120000)
await servers[0].kill() await servers[0].kill()
await servers[0].run({}, { env: goodEnv }) await servers[0].run({}, { env: goodEnv })
@ -111,7 +111,7 @@ describe('Test proxy', function () {
}) })
it('Should fail import with a wrong proxy config', async function () { it('Should fail import with a wrong proxy config', async function () {
this.timeout(40000) this.timeout(120000)
await servers[0].kill() await servers[0].kill()
await servers[0].run({}, { env: badEnv }) await servers[0].run({}, { env: badEnv })

20
server/tests/api/videos/multiple-servers.ts
View File

@ -380,7 +380,7 @@ describe('Test multiple servers', function () {
describe('Should seed the uploaded video', function () { describe('Should seed the uploaded video', function () {
it('Should add the file 1 by asking server 3', async function () { it('Should add the file 1 by asking server 3', async function () {
this.timeout(10000) this.timeout(30000)
const { data } = await servers[2].videos.list() const { data } = await servers[2].videos.list()
@ -396,7 +396,7 @@ describe('Test multiple servers', function () {
}) })
it('Should add the file 2 by asking server 1', async function () { it('Should add the file 2 by asking server 1', async function () {
this.timeout(10000) this.timeout(30000)
const { data } = await servers[0].videos.list() const { data } = await servers[0].videos.list()
@ -410,7 +410,7 @@ describe('Test multiple servers', function () {
}) })
it('Should add the file 3 by asking server 2', async function () { it('Should add the file 3 by asking server 2', async function () {
this.timeout(10000) this.timeout(30000)
const { data } = await servers[1].videos.list() const { data } = await servers[1].videos.list()
@ -424,7 +424,7 @@ describe('Test multiple servers', function () {
}) })
it('Should add the file 3-2 by asking server 1', async function () { it('Should add the file 3-2 by asking server 1', async function () {
this.timeout(10000) this.timeout(30000)
const { data } = await servers[0].videos.list() const { data } = await servers[0].videos.list()
@ -438,7 +438,7 @@ describe('Test multiple servers', function () {
}) })
it('Should add the file 2 in 360p by asking server 1', async function () { it('Should add the file 2 in 360p by asking server 1', async function () {
this.timeout(10000) this.timeout(30000)
const { data } = await servers[0].videos.list() const { data } = await servers[0].videos.list()
@ -595,7 +595,7 @@ describe('Test multiple servers', function () {
let updatedAtMin: Date let updatedAtMin: Date
it('Should update video 3', async function () { it('Should update video 3', async function () {
this.timeout(10000) this.timeout(30000)
const attributes = { const attributes = {
name: 'my super video updated', name: 'my super video updated',
@ -618,7 +618,7 @@ describe('Test multiple servers', function () {
}) })
it('Should have the video 3 updated on each server', async function () { it('Should have the video 3 updated on each server', async function () {
this.timeout(10000) this.timeout(30000)
for (const server of servers) { for (const server of servers) {
const { data } = await server.videos.list() const { data } = await server.videos.list()
@ -669,7 +669,7 @@ describe('Test multiple servers', function () {
}) })
it('Should only update thumbnail and update updatedAt attribute', async function () { it('Should only update thumbnail and update updatedAt attribute', async function () {
this.timeout(10000) this.timeout(30000)
const attributes = { const attributes = {
thumbnailfile: 'thumbnail.jpg' thumbnailfile: 'thumbnail.jpg'
@ -861,7 +861,7 @@ describe('Test multiple servers', function () {
}) })
it('Should delete a reply', async function () { it('Should delete a reply', async function () {
this.timeout(10000) this.timeout(30000)
await servers[2].comments.delete({ videoId: videoUUID, commentId: childOfFirstChild.comment.id }) await servers[2].comments.delete({ videoId: videoUUID, commentId: childOfFirstChild.comment.id })
@ -892,7 +892,7 @@ describe('Test multiple servers', function () {
}) })
it('Should delete the thread comments', async function () { it('Should delete the thread comments', async function () {
this.timeout(10000) this.timeout(30000)
const { data } = await servers[0].comments.listThreads({ videoId: videoUUID }) const { data } = await servers[0].comments.listThreads({ videoId: videoUUID })
const commentId = data.find(c => c.text === 'my super first comment').id const commentId = data.find(c => c.text === 'my super first comment').id

4
support/docker/production/Dockerfile.bullseye
View File

@ -21,10 +21,10 @@ WORKDIR /app
USER peertube USER peertube
RUN yarn install --pure-lockfile --network-timeout 1200000 \ RUN yarn install --pure-lockfile --network-timeout 1200000 --network-concurrency 20 \
&& npm run build -- $NPM_RUN_BUILD_OPTS \ && npm run build -- $NPM_RUN_BUILD_OPTS \
&& rm -r ./node_modules ./client/node_modules \ && rm -r ./node_modules ./client/node_modules \
&& yarn install --pure-lockfile --production --network-timeout 1200000 \ && yarn install --pure-lockfile --production --network-timeout 1200000 --network-concurrency 20 \
&& yarn cache clean && yarn cache clean
USER root USER root