Merge branch 'release/1.5.1' into develop

.dockerignore

@@ -13,7 +13,6 @@ Dockerfile*
 
 # Tipi folder
 logs/
-tests/
 state/
 templates/
 scripts/
@@ -24,4 +23,4 @@ data/
 apps/
 app-data/
 .github/
-__mocks__/
+__mocks__/

Dockerfile

@@ -23,6 +23,7 @@ COPY ./esbuild.js ./esbuild.js
 COPY ./tsconfig.json ./tsconfig.json
 COPY ./next.config.mjs ./next.config.mjs
 COPY ./public ./public
+COPY ./tests ./tests
 
 RUN npm run build
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "runtipi",
-  "version": "1.5.0",
+  "version": "1.5.1",
   "description": "A homeserver for everyone",
   "scripts": {
     "copy:migrations": "mkdir -p dist/migrations && cp -r ./src/server/migrations dist",

scripts/start-e2e.sh

@@ -67,7 +67,7 @@ env_variables_json=$(cat <<EOF
   "demo_mode": false,
   "apps_repository": "${apps_repository}",
   "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}"
 }
 EOF

scripts/start.sh

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