Skip to content

Commit

Permalink
Merge pull request #1388 from runtipi/release/3.2.0
Browse files Browse the repository at this point in the history
Release/3.2.0
  • Loading branch information
meienberger committed May 1, 2024
2 parents 1c6c93c + 125d4ca commit eed3742
Show file tree
Hide file tree
Showing 100 changed files with 10,260 additions and 7,535 deletions.
2 changes: 1 addition & 1 deletion .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ ARCHITECTURE=arm64
TIPI_VERSION=1.5.2
JWT_SECRET=secret
ROOT_FOLDER_HOST=/path/to/runtipi
STORAGE_PATH=/path/to/runtipi
RUNTIPI_APP_DATA_PATH=/path/to/runtipi
NGINX_PORT=7000
NGINX_PORT_SSL=443
DOMAIN=tipi.localhost
Expand Down
17 changes: 11 additions & 6 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -1,26 +1,31 @@
---
name: Bug report
about: Create a report to help us improve
title: "[BUG]"
title: '[BUG]'
labels: bug
assignees: meienberger

---

### Checklist

Before opening your issue be sure to have completed all those tasks.

- [ ] My issue is not related to an app I installed through tipi (If so please open your issue here: https://github.com/runtipi/runtipi-appstore/issues)
- [ ] My issue is not a support request (eg: "My instance is not running after update". If so please ask for support in the help section of our [Discord server](https://discord.gg/gyeHhmvwaK))
- [ ] I have searched for an already existing issue with similar context and errors. My issue has not yet been reported.
- [ ] I have included a clear description and steps to reproduce.
- [ ] I have included the result of the command `./runtipi-cli debug`
- [ ] I have included logs from the file `runtipi/logs/error.log` if relevant
- [ ] I am using a custom docker compose file (`user-config/tipi-compose.yml`)

**Describe the bug**
A clear and concise description of what the bug is.

> Warning ⚠️: If you use a custom docker compose file (located in `user-config/tipi-compose.yml`) please try to start runtipi without it before submitting an issue. If the issue persists even without the custom docker compose file then proceed to open an issue.
**To Reproduce**
Steps to reproduce the behavior:

1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
Expand All @@ -33,9 +38,9 @@ A clear and concise description of what you expected to happen.
If applicable, add screenshots to help explain your problem.

**Server (please complete the following information):**
- OS: [e.g. Ubuntu 20.04]
- Tipi Version [e.g. 2.0.5] (can be found in settings page)

**Additional context**
Please include logs here `runtipi/logs/error.log` and add any other context about the problem here. Like results of the `start` script or container logs `docker logs ...`
- OS: [e.g. Ubuntu 20.04]
- Tipi Version [e.g. 2.0.5] (can be found in settings page)

**Additional context**
Please include logs here `runtipi/logs/error.log` and add any other context about the problem here. Like results of the `start` script or container logs `docker logs ...` or include your custom docker compose file if its being used
2 changes: 1 addition & 1 deletion .github/workflows/alpha-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ jobs:
workflow_inputs: '{ "version": "${{ needs.create-tag.outputs.tagname }}" }'

- name: Await Run ID ${{ steps.return_dispatch.outputs.run_id }}
uses: Codex-/await-remote-run@v1.11.0
uses: Codex-/await-remote-run@v1.12.2
with:
token: ${{ secrets.PAT_CLI }}
repo: cli
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/beta-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ jobs:
workflow_inputs: '{ "version": "${{ needs.create-tag.outputs.tagname }}" }'

- name: Await Run ID ${{ steps.return_dispatch.outputs.run_id }}
uses: Codex-/await-remote-run@v1.11.0
uses: Codex-/await-remote-run@v1.12.2
with:
token: ${{ secrets.PAT_CLI }}
repo: cli
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ jobs:
path: playwright-report/

- name: Setup Pages
uses: actions/configure-pages@v4
uses: actions/configure-pages@v5

- name: Upload artifact
uses: actions/upload-pages-artifact@v3
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/nightly-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,13 @@ jobs:
id: return_dispatch
with:
token: ${{ secrets.PAT_CLI }}
ref: main
ref: develop
repo: cli
owner: runtipi
workflow: nightly.yml

- name: Await Run ID ${{ steps.return_dispatch.outputs.run_id }}
uses: Codex-/await-remote-run@v1.11.0
uses: Codex-/await-remote-run@v1.12.2
with:
token: ${{ secrets.PAT_CLI }}
repo: cli
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ jobs:
workflow_inputs: '{ "version": "${{ needs.create-tag.outputs.tagname }}" }'

- name: Await Run ID ${{ steps.return_dispatch.outputs.run_id }}
uses: Codex-/await-remote-run@v1.11.0
uses: Codex-/await-remote-run@v1.12.2
with:
token: ${{ secrets.PAT_CLI }}
repo: cli
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ WORKDIR /worker

ARG TARGETARCH
ENV TARGETARCH=${TARGETARCH}
ARG DOCKER_COMPOSE_VERSION="v2.23.3"
ARG DOCKER_COMPOSE_VERSION="v2.27.0"

RUN echo "Building for ${TARGETARCH}"

Expand Down
2 changes: 0 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,6 @@ You can try out a demo of Tipi at [demo.runtipi.io](https://demo.runtipi.io) usi

## 📚 Documentation

For a detailed guide on how to install Tipi. This amazing article by @kycfree [Running a Home Server with Tipi](https://kyc3.life/running-a-home-server-with-tipi/)

You can find more documentation and tutorials / FAQ on [runtipi.io](https://www.runtipi.io/docs/introduction?utm_source=github&utm_medium=README&utm_campaign=main-repo-docs)

## ❤️ Contributing
Expand Down
17 changes: 8 additions & 9 deletions docker-compose.dev.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '3.7'

services:
runtipi-reverse-proxy:
container_name: runtipi-reverse-proxy
Expand Down Expand Up @@ -74,13 +72,14 @@ services:
- ./packages/worker/src:/app/packages/worker/src
- ./packages/shared/src:/app/packages/shared/src
# Data
- ./state:/data/state
- ./repos:/data/repos
- ./apps:/data/apps
- ./logs:/data/logs
- ./traefik:/data/traefik
- ./user-config:/data/user-config
- ${STORAGE_PATH:-$PWD}/app-data:/app-data
- ${RUNTIPI_MEDIA_PATH:-.}/media:/data/media
- ${RUNTIPI_STATE_PATH:-.}/state:/data/state
- ${RUNTIPI_REPOS_PATH:-.}/repos:/data/repos
- ${RUNTIPI_APPS_PATH:-.}/apps:/data/apps
- ${RUNTIPI_LOGS_PATH:-.}/logs:/data/logs
- ${RUNTIPI_TRAEFIK_PATH:-.}/traefik:/data/traefik
- ${RUNTIPI_USER_CONFIG_PATH:-.}/user-config:/data/user-config
- ${RUNTIPI_APP_DATA_PATH:-.}/app-data:/app-data
# Static
- ./.env:/data/.env
- /var/run/docker.sock:/var/run/docker.sock:ro
Expand Down
18 changes: 8 additions & 10 deletions docker-compose.prod.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '3.9'

services:
runtipi-reverse-proxy:
container_name: runtipi-reverse-proxy
Expand Down Expand Up @@ -81,14 +79,14 @@ services:
- .env
volumes:
# Data
- ./media:/data/media
- ./state:/data/state
- ./repos:/data/repos
- ./apps:/data/apps
- ./logs:/data/logs
- ./traefik:/data/traefik
- ./user-config:/data/user-config
- ${STORAGE_PATH:-$PWD}/app-data:/app-data
- ${RUNTIPI_MEDIA_PATH:-.}/media:/data/media
- ${RUNTIPI_STATE_PATH:-.}/state:/data/state
- ${RUNTIPI_REPOS_PATH:-.}/repos:/data/repos
- ${RUNTIPI_APPS_PATH:-.}/apps:/data/apps
- ${RUNTIPI_LOGS_PATH:-.}/logs:/data/logs
- ${RUNTIPI_TRAEFIK_PATH:-.}/traefik:/data/traefik
- ${RUNTIPI_USER_CONFIG_PATH:-.}/user-config:/data/user-config
- ${RUNTIPI_APP_DATA_PATH:-.}/app-data:/app-data
# Static
- ./.env:/data/.env
- /var/run/docker.sock:/var/run/docker.sock:ro
Expand Down
21 changes: 19 additions & 2 deletions e2e/0005-guest-dashboard.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,27 @@ test('user can activate the guest dashboard and see it when logged out', async (

test('logged out users can see the apps on the guest dashboard', async ({ browser }) => {
await setSettings({ guestDashboard: true });
await db.insert(appTable).values({
config: {},
isVisibleOnGuestDashboard: true,
id: 'hello-world',
exposed: true,
exposedLocal: true,
domain: 'duckduckgo.com',
status: 'running',
openPort: true,
});
await db
.insert(appTable)
.values({ config: {}, isVisibleOnGuestDashboard: true, id: 'hello-world', exposed: true, domain: 'duckduckgo.com', status: 'running' });
await db.insert(appTable).values({ config: {}, isVisibleOnGuestDashboard: false, id: 'actual-budget', exposed: false, status: 'running' });
.values({
config: {},
openPort: true,
isVisibleOnGuestDashboard: false,
id: 'actual-budget',
exposed: false,
exposedLocal: false,
status: 'running',
});

const context = await browser.newContext();
const page = await context.newPage();
Expand Down
3 changes: 3 additions & 0 deletions next.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ const nextConfig = {
transpilePackages: ['@runtipi/shared'],
experimental: {
serverComponentsExternalPackages: ['bullmq'],
outputFileTracingIncludes: {
'/login': ['./node_modules/argon2/**'],
},
},
async rewrites() {
return [
Expand Down
72 changes: 36 additions & 36 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "runtipi",
"version": "3.1.3",
"version": "3.2.0",
"description": "A homeserver for everyone",
"scripts": {
"clean-containers": "docker rm -f $(docker ps -a -q)",
Expand All @@ -15,7 +15,7 @@
"db:migrate": "NODE_ENV=development dotenv -e .env.local -- tsx ./src/server/run-migrations-dev.ts",
"lint": "next lint",
"lint:fix": "next lint --fix",
"build": "next experimental-compile",
"build": "next build --experimental-build-mode compile",
"start": "NODE_ENV=production node server.js",
"start:dev-container": "./.devcontainer/filewatcher.sh && npm run start:dev",
"start:rc": "docker compose -f docker-compose.rc.yml --env-file .env up --build",
Expand Down Expand Up @@ -44,30 +44,30 @@
"@radix-ui/react-tabs": "^1.0.4",
"@runtipi/postgres-migrations": "^5.3.0",
"@runtipi/shared": "workspace:^",
"@sentry/integrations": "^7.107.0",
"@sentry/nextjs": "^7.107.0",
"@sentry/integrations": "^7.111.0",
"@sentry/nextjs": "^7.111.0",
"@tabler/core": "1.0.0-beta20",
"@tabler/icons-react": "^2.47.0",
"@tabler/icons-react": "^3.2.0",
"argon2": "^0.40.1",
"bullmq": "^5.4.3",
"bullmq": "^5.7.4",
"clsx": "^2.1.0",
"connect-redis": "^7.1.1",
"drizzle-orm": "^0.30.4",
"drizzle-orm": "^0.30.9",
"fs-extra": "^11.2.0",
"geist": "^1.2.2",
"geist": "^1.3.0",
"jsonwebtoken": "^9.0.2",
"let-it-go": "^1.0.0",
"lodash.merge": "^4.6.2",
"minisearch": "^6.3.0",
"next": "14.1.4",
"next-client-cookies": "^1.1.0",
"next-intl": "^3.9.5",
"next": "14.2.2",
"next-client-cookies": "^1.1.1",
"next-intl": "^3.11.3",
"next-safe-action": "^6.2.0",
"pg": "^8.11.3",
"pg": "^8.11.5",
"qrcode.react": "^3.1.0",
"react": "18.2.0",
"react-dom": "18.2.0",
"react-hook-form": "^7.51.1",
"react-hook-form": "^7.51.3",
"react-hot-toast": "^2.4.1",
"react-markdown": "^9.0.1",
"react-query": "^3.39.3",
Expand All @@ -77,20 +77,20 @@
"rehype-raw": "^7.0.0",
"remark-breaks": "^4.0.0",
"remark-gfm": "^4.0.0",
"sass": "^1.72.0",
"sass": "^1.75.0",
"semver": "^7.6.0",
"sharp": "0.32.6",
"sharp": "0.33.3",
"socket.io-client": "^4.7.5",
"uuid": "^9.0.1",
"validator": "^13.11.0",
"winston": "^3.12.0",
"zod": "^3.22.4",
"winston": "^3.13.0",
"zod": "^3.23.0",
"zustand": "^4.5.2"
},
"devDependencies": {
"@babel/core": "^7.24.3",
"@babel/core": "^7.24.4",
"@faker-js/faker": "^8.4.1",
"@playwright/test": "^1.42.1",
"@playwright/test": "^1.43.1",
"@testing-library/dom": "^9.3.4",
"@testing-library/jest-dom": "^6.4.2",
"@testing-library/react": "^14.2.2",
Expand All @@ -101,48 +101,48 @@
"@types/jest": "^29.5.12",
"@types/jsonwebtoken": "^9.0.6",
"@types/lodash.merge": "^4.6.9",
"@types/node": "20.11.30",
"@types/pg": "^8.11.4",
"@types/react": "18.2.67",
"@types/react-dom": "18.2.22",
"@types/node": "20.12.7",
"@types/pg": "^8.11.5",
"@types/react": "18.2.79",
"@types/react-dom": "18.2.25",
"@types/semver": "^7.5.8",
"@types/ssh2": "^1.15.0",
"@types/uuid": "^9.0.8",
"@types/validator": "^13.11.9",
"@typescript-eslint/eslint-plugin": "^6.21.0",
"@typescript-eslint/parser": "^6.21.0",
"@vitejs/plugin-react": "^4.2.1",
"@vitest/coverage-v8": "^1.4.0",
"@vitest/coverage-v8": "^1.5.0",
"dotenv-cli": "^7.4.1",
"eslint": "8.57.0",
"eslint-config-airbnb": "^19.0.4",
"eslint-config-airbnb-typescript": "^17.1.0",
"eslint-config-next": "14.1.4",
"eslint-config-next": "14.2.2",
"eslint-config-prettier": "^9.1.0",
"eslint-import-resolver-typescript": "^3.6.1",
"eslint-plugin-drizzle": "^0.2.3",
"eslint-plugin-import": "^2.29.1",
"eslint-plugin-jest": "^27.9.0",
"eslint-plugin-jest-dom": "^5.1.0",
"eslint-plugin-jsonc": "^2.14.1",
"eslint-plugin-jest": "^28.2.0",
"eslint-plugin-jest-dom": "^5.4.0",
"eslint-plugin-jsonc": "^2.15.1",
"eslint-plugin-jsx-a11y": "^6.8.0",
"eslint-plugin-react": "^7.34.1",
"eslint-plugin-react-hooks": "^4.6.0",
"eslint-plugin-testing-library": "^6.2.0",
"eslint-plugin-testing-library": "^6.2.2",
"jest": "^29.7.0",
"jest-environment-jsdom": "^29.7.0",
"knip": "^5.1.5",
"memfs": "^4.8.0",
"msw": "^2.2.9",
"next-router-mock": "^0.9.12",
"knip": "^5.9.4",
"memfs": "^4.8.2",
"msw": "^2.2.14",
"next-router-mock": "^0.9.13",
"prettier": "^3.2.5",
"ssh2": "^1.15.0",
"ts-jest": "^29.1.2",
"ts-node": "^10.9.2",
"tsx": "^4.7.1",
"typescript": "5.4.3",
"tsx": "^4.7.2",
"typescript": "5.4.5",
"vite-tsconfig-paths": "^4.3.2",
"vitest": "^1.4.0",
"vitest": "^1.5.0",
"wait-for-expect": "^3.0.2"
},
"msw": {
Expand Down
6 changes: 3 additions & 3 deletions packages/shared/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,11 @@
"dependencies": {
"lodash.clonedeep": "^4.5.0",
"validator": "^13.11.0",
"winston": "^3.12.0",
"zod": "^3.22.4"
"winston": "^3.13.0",
"zod": "^3.23.0"
},
"devDependencies": {
"@sentry/types": "^7.107.0",
"@sentry/types": "^7.111.0",
"@types/lodash.clonedeep": "^4.5.9"
}
}

0 comments on commit eed3742

Please sign in to comment.