beenull/runtipi
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' into release/1.5.1

Browse source
This commit is contained in:
Nicolas Meienberger 2023-06-28 22:37:50 +02:00 committed by Nicolas Meienberger
commit 0555a7f321
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
scripts/start-e2e.sh
View file

@ -67,7 +67,7 @@ env_variables_json=$(cat <<EOF
"demo_mode": false, "demo_mode": false,
"apps_repository": "${apps_repository}", "apps_repository": "${apps_repository}",
"storage_path": "${ROOT_FOLDER}", "storage_path": "${ROOT_FOLDER}",
"repo_id": "$("${ROOT_FOLDER}"/scripts/git.sh get_hash ${apps_repository})", "repo_id": "$("${ROOT_FOLDER}"/scripts/git.sh get_hash "${apps_repository}")",
"docker_tag": "${DOCKER_TAG}" "docker_tag": "${DOCKER_TAG}"
} }
EOF EOF

4
scripts/start.sh
View file

@ -94,7 +94,7 @@ env_variables_json=$(cat <<EOF
"tipi_version": "$(get_json_field "${ROOT_FOLDER}/package.json" version)", "tipi_version": "$(get_json_field "${ROOT_FOLDER}/package.json" version)",
"nginx_port": 80, "nginx_port": 80,
"nginx_port_ssl": 443, "nginx_port_ssl": 443,
"postgres_password": "$(derive_entropy "postgres") "postgres_password": "$(derive_entropy "postgres")",
"postgres_username": "tipi", "postgres_username": "tipi",
"postgres_dbname": "tipi", "postgres_dbname": "tipi",
"postgres_port": 5432, "postgres_port": 5432,
@ -105,7 +105,7 @@ env_variables_json=$(cat <<EOF
"apps_repository": "${apps_repository}", "apps_repository": "${apps_repository}",
"domain": "example.com", "domain": "example.com",
"storage_path": "${ROOT_FOLDER}", "storage_path": "${ROOT_FOLDER}",
"demo_mode": false, "demo_mode": false
} }
EOF EOF
) )

2
src/server/tests/vite.setup.ts
View file

@ -1,5 +1,5 @@
import { redisMock } from '@/tests/mocks/redis';
import { vi } from 'vitest'; import { vi } from 'vitest';
import { redisMock } from '../../../tests/mocks/redis';
vi.mock('../core/Logger', () => ({ vi.mock('../core/Logger', () => ({
Logger: { Logger: {