fix merge conflicts

README.md

@@ -1,30 +1,23 @@
-<p align="center">
-<img src="docs/logo/kubero-logo-horizontal.png">
-</p>
-<hr>
-<br>
+![](docs/logo/kubero-logo-horizontal.png)
 
-<a href="https://github.com/kubero-dev/kubero/blob/main/LICENSE" target="_blank"><img alt="License" src="https://img.shields.io/github/license/kubero-dev/kubero?style=flat-square&color=blue"></a>
-<a href="https://github.com/kubero-dev/kubero/releases/latest" target="_blank"><img alt="GitHub release (latest by date)" src="https://img.shields.io/github/v/release/kubero-dev/kubero?style=flat-square&color=brightgreen"></a>
-<a href="https://discord.gg/tafRPMWS4r" target="_blank"><img alt="Discord" src="https://img.shields.io/discord/1051249947472826408?style=flat-square"></a><!--<img alt="GitHub Downloads all releases" src="https://img.shields.io/github/downloads/kubero-dev/kubero-cli/total?style=flat-square&label=cli downloads">-->
-<a href="https://github.com/kubero-dev/kubero/releases/latest" target="_blank"><img alt="GitHub (Pre-)Release Date" src="https://img.shields.io/github/release-date-pre/kubero-dev/kubero?style=flat-square"></a>
-<a href="https://demo.kubero.dev" target="_blank"><img alt="Demo" src="https://img.shields.io/badge/demo-up-sucess?style=flat-square&color=blue"></a>
+---
 
+[![License](https://img.shields.io/github/license/kubero-dev/kubero?style=flat-square&color=blue")](https://github.com/kubero-dev/kubero/blob/main/LICENSE) 
+[![GitHub release (latest by date)](https://img.shields.io/github/v/release/kubero-dev/kubero?style=flat-square&color=brightgreen)](https://github.com/kubero-dev/kubero/releases/latest)
+[![Discord](https://img.shields.io/discord/1051249947472826408?style=flat-square)](https://discord.gg/tafRPMWS4r)
+[![GitHub (Pre-)Release Date](https://img.shields.io/github/release-date-pre/kubero-dev/kubero?style=flat-square)](https://github.com/kubero-dev/kubero/releases/latest)
+[![Demo](https://img.shields.io/badge/demo-up-sucess?style=flat-square&color=blue)](https://demo.kubero.dev)
 
-<br>
 Kubero [pronounced: Kube Hero] is a self-hosted PaaS (Platform as a Service) that allows any developer to deploy their application on Kubernetes without specialized knowledge. Kubero follows the principles of 12-factor apps. It is possible to run apps based on existing containers or from source code.
 
-<br>
-<br>
+![](docs/screenshots/createapp.gif)
 
-<img src="docs/screenshots/createapp.gif">
-
-More <a href="https://docs.kubero.dev/screenshots" target="_blank">Screenshots</a> and a full video on
-<a href="https://www.youtube.com/watch?v=kmqhddc6UlI" target="_blank">YouTube</a><p>
+More [Screenshots](https://docs.kubero.dev/screenshots) and a full video on
+[YouTube](https://www.youtube.com/watch?v=kmqhddc6UlI)
 
 ## How GitOps Works ([DEMO](https://demo.kubero.dev))
 1. Create a pipeline with the phases you need (review, test, stage, production)
-2. (optional) Connect the pipeline to your git repository (Github, Bitbucket, Gitlab, Gitea, Gogs)
+2. (optional) Connect the pipeline to your git repository (GitHub, Bitbucket, GiLab, Gitea, Gogs)
 3. Configure your apps with cronjobs and addons
 
 Kubero starts now building your app. Once the build is complete, Kubero will launch the final container and make it accessible via the configured domain. 
@@ -44,7 +37,7 @@ Kubero starts now building your app. Once the build is complete, Kubero will lau
 - Built-in **container web console**
 - Build and deployment **Notifications** to Discord/Slack/Webhooks
 - Integrated **metrics and monitoring**
-- **SSO** with Github and Oauth2
+- **SSO** with GitHub and Oauth2
 
 ## Supported GIT repositories (hosted and self-hosted)
 - Gitea / Forgejo
@@ -67,24 +60,24 @@ Basically *everything* that can be packaged in a single container can be deploye
 
 ## Add-ons
 
-|   | Addon | Maintainer | Built in* |
-|---|-------|------------|-----------|
-| <img src="client/public/img/addons/MySQL.png" width="30px" style="vertical-align: middle; margin: 10px"> | MySQL | [Bitnami](https://github.com/bitnami/charts/tree/main/bitnami/mysql) | ✅ |
-| <img src="client/public/img/addons/postgresql.png" width="30px" style="vertical-align: middle; margin: 10px"> | PostgreSQL | [Bitnami](https://github.com/bitnami/charts/tree/main/bitnami/postgresql) | ✅ |
-| <img src="client/public/img/addons/Redis.png" width="30px" style="vertical-align: middle; margin: 10px"> | Redis | [Bitnami](https://github.com/bitnami/charts/tree/main/bitnami/redis) | ✅ |
-| <img src="client/public/img/addons/MongoDB.png" width="30px" style="vertical-align: middle; margin: 10px"> | MongoDB | [Bitnami](https://github.com/bitnami/charts/tree/main/bitnami/mongodb) | ✅ |
-| <img src="client/public/img/addons/Elasticsearch.png" width="30px" style="vertical-align: middle; margin: 10px"> | Elasticsearch | [Bitnami](https://github.com/bitnami/charts/tree/main/bitnami/elasticsearch)  | ✅ |
-| <img src="client/public/img/addons/Kafka.png" width="30px" style="vertical-align: middle; margin: 10px"> | Kafka | [Bitnami](https://github.com/bitnami/charts/tree/main/bitnami/kafka)  | ✅ |
-| <img src="client/public/img/addons/CouchDB.png" width="30px" style="vertical-align: middle; margin: 10px"> | CouchDB | [Apache](https://apache.github.io/couchdb-helm) | ✅ |
-| <img src="client/public/img/addons/Haraka.png" width="30px" style="vertical-align: middle; margin: 10px"> | Haraka Mail Server | [Kubero](https://github.com/kubero-dev/haraka-docker) | ✅ |
-| <img src="client/public/img/addons/Memcached.png" width="30px" style="vertical-align: middle; margin: 10px"> | Memcache | [Bitnami](https://github.com/bitnami/charts/tree/main/bitnami/memcached)  | ✅ |
-| <img src="client/public/img/addons/RabbitMQ.png" width="30px" style="vertical-align: middle; margin: 10px"> | RabbitMQ | [Bitnami](https://github.com/bitnami/charts/tree/main/bitnami/rabbitmq)  | ✅ |
-| <img src="client/public/img/addons/cloudflare.svg" width="30px" style="vertical-align: middle; margin: 10px"> | Cludflare Tunnels | [Adianth](https://github.com/adyanth/cloudflare-operator) |  |
-| <img src="client/public/img/addons/Minio.png" width="30px" style="vertical-align: middle; margin: 10px"> | Minio | [Minio](https://artifacthub.io/packages/olm/community-operators/minio-operator) |  |
-| <img src="client/public/img/addons/MongoDB.png" width="30px" style="vertical-align: middle; margin: 10px"> | Percona MongoDB Cluster | [Percona](https://artifacthub.io/packages/olm/community-operators/mongodb-operator) |  |
-| <img src="client/public/img/addons/postgresql.png" width="30px" style="vertical-align: middle; margin: 10px"> | Crunchy Postgres Cluster | [Crunchy Data](https://artifacthub.io/packages/olm/community-operators/postgresql) |  |
-| <img src="client/public/img/addons/Redis.png" width="30px" style="vertical-align: middle; margin: 10px"> | Redis Cluster | [Opstree](https://artifacthub.io/packages/olm/community-operators/redis-operator) |  |
-| <img src="client/public/img/addons/CockroachDB.svg" width="30px" style="vertical-align: middle; margin: 10px"> | CockroachDB| [CockroachDB](https://artifacthub.io/packages/olm/community-operators/cockroachdb) |  |
+|                                                 | Addon                    | Maintainer                                                                          | Built in* |
+|-------------------------------------------------|--------------------------|-------------------------------------------------------------------------------------|-----------|
+| ![](client/public/img/addons/MySQL.png)         | MySQL                    | [Bitnami](https://github.com/bitnami/charts/tree/main/bitnami/mysql)                | ✅         |
+| ![](client/public/img/addons/postgresql.png)    | PostgreSQL               | [Bitnami](https://github.com/bitnami/charts/tree/main/bitnami/postgresql)           | ✅         |
+| ![](client/public/img/addons/Redis.png)         | Redis                    | [Bitnami](https://github.com/bitnami/charts/tree/main/bitnami/redis)                | ✅         |
+| ![](client/public/img/addons/MongoDB.png)       | MongoDB                  | [Bitnami](https://github.com/bitnami/charts/tree/main/bitnami/mongodb)              | ✅         |
+| ![](client/public/img/addons/Elasticsearch.png) | Elasticsearch            | [Bitnami](https://github.com/bitnami/charts/tree/main/bitnami/elasticsearch)        | ✅         |
+| ![](client/public/img/addons/Kafka.png)         | Kafka                    | [Bitnami](https://github.com/bitnami/charts/tree/main/bitnami/kafka)                | ✅         |
+| ![](client/public/img/addons/CouchDB.png)       | CouchDB                  | [Apache](https://apache.github.io/couchdb-helm)                                     | ✅         |
+| ![](client/public/img/addons/Haraka.png)        | Haraka Mail Server       | [Kubero](https://github.com/kubero-dev/haraka-docker)                               | ✅         |
+| ![](client/public/img/addons/Memcached.png)     | Memcache                 | [Bitnami](https://github.com/bitnami/charts/tree/main/bitnami/memcached)            | ✅         |
+| ![](client/public/img/addons/RabbitMQ.png)      | RabbitMQ                 | [Bitnami](https://github.com/bitnami/charts/tree/main/bitnami/rabbitmq)             | ✅         |
+| ![](client/public/img/addons/cloudflare.svg)    | Cloudflare Tunnels       | [Adianth](https://github.com/adyanth/cloudflare-operator)                           |           |
+| ![](client/public/img/addons/Minio.png)         | Minio                    | [Minio](https://artifacthub.io/packages/olm/community-operators/minio-operator)     |           |
+| ![](client/public/img/addons/MongoDB.png)       | Percona MongoDB Cluster  | [Percona](https://artifacthub.io/packages/olm/community-operators/mongodb-operator) |           |
+| ![](client/public/img/addons/postgresql.png)    | Crunchy Postgres Cluster | [Crunchy Data](https://artifacthub.io/packages/olm/community-operators/postgresql)  |           |
+| ![](client/public/img/addons/Redis.png)         | Redis Cluster            | [Opstree](https://artifacthub.io/packages/olm/community-operators/redis-operator)   |           |
+| ![](client/public/img/addons/CockroachDB.svg)   | CockroachDB              | [CockroachDB](https://artifacthub.io/packages/olm/community-operators/cockroachdb)  |           |
 
 
 \* Ships with the Kubero Operator
@@ -93,31 +86,37 @@ Basically *everything* that can be packaged in a single container can be deploye
 - WordPress
 - Grafana
 - Bitwarden
-- <a href="https://uptime.kuma.pet" target="_blank">Kuma</a>
-- <a href="https://github.com/zadam/trilium" target="_blank">Trilium Notes</a>
+- [Kuma](https://uptime.kuma.pet)
+- [Trilium Notes](https://github.com/zadam/trilium)
 - ...
 
 Check out the full [list here](https://www.kubero.dev/templates/) or submit your own app! [Read here](https://github.com/kubero-dev/kubero/blob/main/services/) how to do it.
 
 ## Basic Concept 
 Kubero is Kubernetes native and runs with two containers on any Kubernetes instance (kubero-ui and Operator). All data is stored on your Kubernetes etcd without an extra database.
-<br>
-<br>
 
-<img src="docs/img/highlevel.png">
+
+
+
+
+
+
+![](docs/img/highlevel.png)
 
 ## Quickstart
 **1) Download and unpack the <a href="https://github.com/kubero-dev/kubero-cli/releases/latest">Kubero CLI</a>** (MacOS, Linux, Windows)<p>
 
 Binaries (MacOS, Linux)
-```
-curl -fsSL get.kubero.dev | bash
+
+```bash
+$ curl -fsSL get.kubero.dev | bash
 ```
 
 Brew (MacOS, Linux)
-```
-brew tap kubero-dev/kubero
-brew install kubero-cli
+
+```bash
+$ brew tap kubero-dev/kubero
+$ brew install kubero-cli
 ```
 
 **2) Run `kubero install` to install all components on a new or your existing cluster**

server/package.json

@@ -28,7 +28,7 @@
     "cross-fetch": "^3.1.5",
     "debug": "^4.3.4",
     "dotenv": "^16.0.1",
-    "express": "^4.19.2",
+    "express": "^4.20.0",
     "express-session": "^1.17.3",
     "git-url-parse": "^13.1.0",
     "gitea-js": "^1.2.0",