diff --git a/public/v4/apps/umami-mysql.yml b/public/v4/apps/umami-mysql.yml new file mode 100644 index 0000000..fccbe06 --- /dev/null +++ b/public/v4/apps/umami-mysql.yml @@ -0,0 +1,69 @@ +captainVersion: 4 +services: + # Umami mysql + $$cap_appname: + image: ghcr.io/mikecao/umami:mysql-$$cap_umami_version + restart: always + environment: + DATABASE_URL: mysql://umami:$$cap_mysql_pass@srv-captain--$$cap_appname-mysql/umami + depends_on: + - $$cap_appname-mysql + caproverExtra: + containerHttpPort: '3000' + # Mysql + $$cap_appname-mysql: + image: mysql:$$cap_mysql_version + volumes: + - $$cap_appname-mysql-data:/var/lib/mysql + restart: always + environment: + MYSQL_DATABASE: umami + MYSQL_USER: umami + MYSQL_PASSWORD: $$cap_mysql_pass + MYSQL_ROOT_PASSWORD: $$cap_mysql_root_pass + caproverExtra: + notExposeAsWebApp: 'true' +caproverOneClickApp: + variables: + - id: $$cap_mysql_version + label: Mysql Version + defaultValue: '8' + description: Checkout their page for the valid tags https://hub.docker.com/_/mysql + validRegex: /^([^\s^\/])+$/ + - id: $$cap_umami_version + label: Caprover Umami Version + defaultValue: 'v1.33.2' + description: Checkout their github page for the valid tags (minimum compatible version 1.33.2) https://github.com/mikecao/umami/releases + validRegex: /^([^\s^\/])+$/ + - id: $$cap_mysql_pass + label: mysql Database password + description: 'Password for mysql' + defaultValue: $$cap_gen_random_hex(16) + validRegex: /^([^\s^\/])+$/ + - id: $$cap_mysql_root_pass + label: mysql ROOT Database password + description: 'Password for mysql root' + defaultValue: $$cap_gen_random_hex(16) + validRegex: /^([^\s^\/])+$/ + instructions: + start: >- + umami is a simple, easy to use, self-hosted web analytics solution. The goal is to provide you with a friendly privacy-focused alternative to Google Analytics. + + + This app will install a default mysql instance with persistant data. You can choose the version yourself. The deployment was tested with mysql 8.0.x. + + For Updating just Deploy latest image from https://github.com/mikecao/umami/pkgs/container/umami using the Deploy via ImageName section in your caprover umami container + + For more details about umami, see: https://umami.is + + + Enter your configuration parameters and click on next. It will take about a minute for the process to finish. + end: >- + Aaaand you're done! 🔥 + Your umami instance is available at http://$$cap_appname.$$cap_root_domain + + IMPORTANT: Use user 'admin' and password 'umami' to login and change your password immediately! + displayName: umami + isOfficial: true + description: umami is a simple, easy to use, self-hosted web analytics solution. The goal is to provide you with a friendly privacy-focused alternative to Google Analytics. + documentation: Official docs are [here](https://github.com/mikecao/umami) diff --git a/public/v4/apps/umami-only.yml b/public/v4/apps/umami-only.yml new file mode 100644 index 0000000..2b7fde5 --- /dev/null +++ b/public/v4/apps/umami-only.yml @@ -0,0 +1,57 @@ +captainVersion: 4 +services: + # Umami + $$cap_appname: + image: ghcr.io/mikecao/umami:$$cap_db_type-$$cap_umami_version + restart: always + environment: + DATABASE_URL: $$cap_db_type://$$cap_db_user:$$cap_db_pass@$$cap_db_url/$$cap_db_name + caproverExtra: + containerHttpPort: '3000' +caproverOneClickApp: + variables: + - id: '$$cap_umami_version' + label: Caprover Umami Version + defaultValue: 'v1.33.2' + description: Checkout their github page for the valid tags (minimum compatible version 1.33.2) https://github.com/mikecao/umami/releases + validRegex: /^([^\s^\/])+$/ + - id: '$$cap_db_type' + label: Database Type (postgresql or mysql) + validRegex: /^(postgresql|mysql)$/ + - id: '$$cap_db_url' + label: Database Remote URL + description: 'if your db is in your caprover network use srv-captain--appName' + validRegex: /^([^\s^\/])+$/ + - id: '$$cap_db_user' + label: Database User + - id: '$$cap_db_name' + label: Database Table Name + description: 'the table that you want use for your umami app' + validRegex: /^([^\s^\/])+$/ + - id: '$$cap_db_pass' + label: Database password + description: 'Password for your Database' + validRegex: /^([^\s^\/])+$/ + instructions: + start: >- + umami is a simple, easy to use, self-hosted web analytics solution. The goal is to provide you with a friendly privacy-focused alternative to Google Analytics. + + + This app will install a default mysql instance with persistant data. You can choose the version yourself. The deployment was tested with mysql 8.0.x and postgres 14.x. + + For Updating just Deploy latest image from https://github.com/mikecao/umami/pkgs/container/umami using the Deploy via ImageName section in your caprover umami container + + For more details about umami, see: https://umami.is + + Note: This app is intended for advanced users who'd like to have a umami without Database service installed. You need run your Database Service and then set the Database configuration accordingly. + + Enter your configuration parameters and click on next. It will take about a minute for the process to finish. + end: >- + Aaaand you're done! 🔥 + Your umami instance is available at http://$$cap_appname.$$cap_root_domain + + IMPORTANT: Use user 'admin' and password 'umami' to login and change your password immediately! + displayName: umami + isOfficial: true + description: umami is a simple, easy to use, self-hosted web analytics solution. The goal is to provide you with a friendly privacy-focused alternative to Google Analytics. + documentation: Official docs are [here](https://github.com/mikecao/umami) diff --git a/public/v4/apps/umami.yml b/public/v4/apps/umami-postgresql.yml similarity index 73% rename from public/v4/apps/umami.yml rename to public/v4/apps/umami-postgresql.yml index 51e3780..9476638 100644 --- a/public/v4/apps/umami.yml +++ b/public/v4/apps/umami-postgresql.yml @@ -1,17 +1,11 @@ captainVersion: 4 services: - # Umami + # Umami postgres $$cap_appname: - image: tschannik/caprover-umami:$$cap_umami_version + image: ghcr.io/mikecao/umami:postgresql-$$cap_umami_version restart: always environment: DATABASE_URL: postgresql://umami:$$cap_postgres_pass@srv-captain--$$cap_appname-postgres/umami - POSTGRES_HOSTNAME: srv-captain--$$cap_appname-postgres - POSTGRES_DB: umami - POSTGRES_USER: umami - POSTGRES_PASSWORD: $$cap_postgres_pass - POSTGRES_INITDB_ARGS: $$cap_pg_initdb_args - HASH_SALT: $$cap_gen_random_hex(16) depends_on: - $$cap_appname-postgres caproverExtra: @@ -33,17 +27,17 @@ caproverOneClickApp: variables: - id: $$cap_postgres_version label: Postgres Version - defaultValue: '12.6-alpine' + defaultValue: '14.4-alpine' description: Checkout their page for the valid tags https://hub.docker.com/_/postgres validRegex: /^([^\s^\/])+$/ - id: $$cap_umami_version label: Caprover Umami Version - defaultValue: 'postgresql-5ecaf55' - description: Checkout their github page for the valid tags https://github.com/tschannik/caprover-umami + defaultValue: 'v1.33.2' + description: Checkout their github page for the valid tags (minimum compatible version v1.33.2) https://github.com/mikecao/umami/releases validRegex: /^([^\s^\/])+$/ - id: $$cap_postgres_pass label: Potgress Database password - description: 'Pasword for postgres' + description: 'Password for postgres' defaultValue: $$cap_gen_random_hex(16) validRegex: /^([^\s^\/])+$/ - id: $$cap_pg_initdb_args @@ -55,11 +49,9 @@ caproverOneClickApp: umami is a simple, easy to use, self-hosted web analytics solution. The goal is to provide you with a friendly privacy-focused alternative to Google Analytics. - This app will install a default postgres instance with persistant data. You can choose the version yourself. The deployment was tested with postgres 12.x. - - After the installation we'll fork a slightly customized version of the original umami package which makes sure that your data is not corrupted on new container deployments or restarts. - Open a PR on https://github.com/tschannik/caprover-umami of your desired umami-version is not supported. + This app will install a default postgres instance with persistant data. You can choose the version yourself. The deployment was tested with postgres 14.x. + For Updating just Deploy latest image from https://github.com/mikecao/umami/pkgs/container/umami using the Deploy via ImageName section in your caprover umami container For more details about umami, see: https://umami.is @@ -71,6 +63,6 @@ caproverOneClickApp: IMPORTANT: Use user 'admin' and password 'umami' to login and change your password immediately! displayName: umami - isOfficial: false + isOfficial: true description: umami is a simple, easy to use, self-hosted web analytics solution. The goal is to provide you with a friendly privacy-focused alternative to Google Analytics. documentation: Official docs are [here](https://github.com/mikecao/umami) diff --git a/public/v4/logos/umami.png b/public/v4/logos/umami-mysql.png similarity index 100% rename from public/v4/logos/umami.png rename to public/v4/logos/umami-mysql.png diff --git a/public/v4/logos/umami-only.png b/public/v4/logos/umami-only.png new file mode 100644 index 0000000..7d947dc Binary files /dev/null and b/public/v4/logos/umami-only.png differ diff --git a/public/v4/logos/umami-postgresql.png b/public/v4/logos/umami-postgresql.png new file mode 100644 index 0000000..7d947dc Binary files /dev/null and b/public/v4/logos/umami-postgresql.png differ