[pull] develop from runtipi:develop

.all-contributorsrc

@@ -311,13 +311,14 @@
     },
     {
       "login": "steveiliop56",
-      "name": "Stavros Iliopoulos",
+      "name": "Stavros",
       "avatar_url": "https://avatars.githubusercontent.com/u/106091011?v=4",
       "profile": "https://github.com/steveiliop56",
       "contributions": [
         "translation",
         "code",
-        "test"
+        "test",
+        "doc"
       ]
     },
     {
@@ -419,6 +420,88 @@
         "test",
         "code"
       ]
+    },
+    {
+      "login": "MontejoJorge",
+      "name": "Jorge Montejo",
+      "avatar_url": "https://avatars.githubusercontent.com/u/56157795?v=4",
+      "profile": "https://github.com/MontejoJorge",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "CiliaFred",
+      "name": "Frédéric Cilia",
+      "avatar_url": "https://avatars.githubusercontent.com/u/1827520?v=4",
+      "profile": "https://github.com/CiliaFred",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "asermax",
+      "name": "Agustín Carrasco",
+      "avatar_url": "https://avatars.githubusercontent.com/u/1452164?v=4",
+      "profile": "https://github.com/asermax",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "thclaude",
+      "name": "Thibault Claude",
+      "avatar_url": "https://avatars.githubusercontent.com/u/23203061?v=4",
+      "profile": "https://thibaultclaude.be",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "DansNewLegs",
+      "name": "Joshua Banks",
+      "avatar_url": "https://avatars.githubusercontent.com/u/152246049?v=4",
+      "profile": "https://github.com/DansNewLegs",
+      "contributions": [
+        "code",
+        "doc"
+      ]
+    },
+    {
+      "login": "hex-developer",
+      "name": "hex-developer",
+      "avatar_url": "https://avatars.githubusercontent.com/u/77530549?v=4",
+      "profile": "https://github.com/hex-developer",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "gabrielfariasnunes",
+      "name": "Gabriel Farias Nunes",
+      "avatar_url": "https://avatars.githubusercontent.com/u/21142663?v=4",
+      "profile": "http://www.bielfarias.com",
+      "contributions": [
+        "translation"
+      ]
+    },
+    {
+      "login": "bcigdemoglu",
+      "name": "Boogie Cigdemoglu",
+      "avatar_url": "https://avatars.githubusercontent.com/u/56985156?v=4",
+      "profile": "http://apidiagram.com",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "Lancelot-Enguerrand",
+      "name": "Lancelot",
+      "avatar_url": "https://avatars.githubusercontent.com/u/18631550?v=4",
+      "profile": "https://github.com/Lancelot-Enguerrand",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "contributorsPerLine": 7,

.devcontainer/devcontainer.json

@@ -6,10 +6,15 @@
       "moby": true
     }
   },
-  "extensions": [
-    "ms-azuretools.vscode-docker",
-    "ms-vscode.vscode-typescript-next",
-    "waderyan.gitblame"
-  ],
-  "postCreateCommand": "./.devcontainer/postCreateCommand.sh"
-}
+  "extensions": ["ms-azuretools.vscode-docker", "ms-vscode.vscode-typescript-next", "waderyan.gitblame"],
+  "postCreateCommand": "./.devcontainer/postCreateCommand.sh",
+  "forwardPorts": [80, 3000],
+  "portsAttributes": {
+    "3000": {
+      "label": "Runtipi"
+    },
+    "80": {
+      "label": "WebSocket"
+    }
+  }
+}

.dockerignore

@@ -1,26 +1,19 @@
-**/node_modules
-**/.next
-/node_modules
-/.next
-node_modules
-.next
-dist/
+*
 
-# all docker-compose files
-docker-compose*.yml
-Dockerfile*
-.dockerignore
-
-# Tipi folder
-logs/
-state/
-templates/
-scripts/
-screenshots/
-repos/
-media/
-data/
-apps/
-app-data/
-.github/
-__mocks__/
+### Includes ###
+!pnpm-*.yaml
+!package.json
+!patches/**
+!packages/**/src/**
+!packages/**/assets/**
+!**/package.json
+!**/nodemon.json
+!**/tsconfig.json
+!**/build.mjs
+!next.config.mjs
+!sentry.*.config.ts
+!public/**
+!src/**
+!tests/**
+!start.*.sh
+!scripts/**

.env.example

@@ -1,22 +1,22 @@
 APPS_REPO_ID=7a92c8307e0a8074763c80be1fcfa4f87da6641daea9211aea6743b0116aba3b
 APPS_REPO_URL=https://github.com/runtipi/runtipi-appstore
-TZ=Etc/UTC
+TZ=Etc/GMT
 INTERNAL_IP=localhost
 DNS_IP=9.9.9.9
 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
-POSTGRES_HOST=tipi-db
+POSTGRES_HOST=runtipi-db
 POSTGRES_DBNAME=tipi
 POSTGRES_USERNAME=tipi
 POSTGRES_PASSWORD=postgres
 POSTGRES_PORT=5432
-REDIS_HOST=tipi-redis
+REDIS_HOST=runtipi-redis
 REDIS_PASSWORD=redis
 DEMO_MODE=false
 LOCAL_DOMAIN=tipi.lan

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,23 +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 '....'
@@ -30,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

.github/dependabot.yml

@@ -1,20 +1,19 @@
-# To get started with Dependabot version updates, you'll need to specify which
-# package ecosystems to update and where the package manifests are located.
-# Please see the documentation for all configuration options:
-# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
-
 version: 2
 updates:
   - package-ecosystem: 'npm'
     directory: '/'
     versioning-strategy: increase
     schedule:
       interval: 'daily'
-    open-pull-requests-limit: 10
     rebase-strategy: 'auto'
-
+    groups:
+      minor-patch:
+        update-types:
+          - minor
+          - patch
+
   - package-ecosystem: 'github-actions'
     directory: '/'
     schedule:
       interval: 'daily'
-    rebase-strategy: 'auto'
+    rebase-strategy: 'auto'

.github/stale.yml

@@ -6,6 +6,7 @@ daysUntilClose: 7
 exemptLabels:
   - pinned
   - security
+  - planned
 # Label to use when marking an issue as stale
 staleLabel: stale
 # Comment to post when marking an issue as stale. Set to `false` to disable