From f13f11a1e2a8385c3c82945bc889ce6332dff329 Mon Sep 17 00:00:00 2001 From: DrMxrcy Date: Thu, 19 May 2022 12:30:36 +0000 Subject: [PATCH 1/9] Added Homarr --- README.md | 1 + apps/homarr/config.json | 13 +++++++++++++ apps/homarr/docker-compose.yml | 0 packages/system-api/src/config/apps.ts | 1 + 4 files changed, 15 insertions(+) create mode 100644 apps/homarr/config.json create mode 100644 apps/homarr/docker-compose.yml diff --git a/README.md b/README.md index 6d2c3883..9e2aabda 100644 --- a/README.md +++ b/README.md @@ -16,6 +16,7 @@ Tipi is a personal homeserver orchestrator. It is running docker containers unde - [Filebrowser](https://github.com/filebrowser/filebrowser) - Web File Browser - [Freshrss](https://github.com/FreshRSS/FreshRSS) - A free, self-hostable RSS aggregator - [Invidious](https://github.com/iv-org/invidious) - An alternative front-end to YouTube +- [Homarr](https://github.com/ajnart/homarr) - A homepage for your server. - [Jackett](https://github.com/Jackett/Jackett) - API Support for your favorite torrent trackers - [Jellyfin](https://github.com/jellyfin/jellyfin) - A media server for your home collection - [Joplin](https://github.com/laurent22/joplin) - Privacy focused note-taking app diff --git a/apps/homarr/config.json b/apps/homarr/config.json new file mode 100644 index 00000000..9c2bf7b3 --- /dev/null +++ b/apps/homarr/config.json @@ -0,0 +1,13 @@ +{ + "name": "Homarr", + "available": true, + "port": 7575, + "id": "homarr", + "description": "A homepage for your server.", + "short_desc": "Homarr is a simple and lightweight homepage for your server, that helps you easily access all of your services in one place.", + "author": "https://github.com/ajnart/", + "source": "https://github.com/ajnart/homar", + "website": "https://discord.gg/C2WTXkzkwK", + "image": "https://user-images.githubusercontent.com/49837342/168315259-b778c816-10fe-44db-bd25-3eea6f31b233.png", + "form_fields": {} +} diff --git a/apps/homarr/docker-compose.yml b/apps/homarr/docker-compose.yml new file mode 100644 index 00000000..e69de29b diff --git a/packages/system-api/src/config/apps.ts b/packages/system-api/src/config/apps.ts index 755f5ad3..31b64333 100644 --- a/packages/system-api/src/config/apps.ts +++ b/packages/system-api/src/config/apps.ts @@ -15,4 +15,5 @@ export const appNames = [ 'n8n', 'invidious', 'joplin', + 'homarr', ]; From c7f2c2c7010ac3d4e103ebea5822a79aba0bdba0 Mon Sep 17 00:00:00 2001 From: DrMxrcy Date: Thu, 19 May 2022 13:47:52 +0000 Subject: [PATCH 2/9] Added Code-Server --- README.md | 1 + apps/code-server/config.json | 21 +++++++++++++++++++++ apps/code-server/docker-compose.yml | 20 ++++++++++++++++++++ packages/system-api/src/config/apps.ts | 1 + 4 files changed, 43 insertions(+) create mode 100644 apps/code-server/config.json create mode 100644 apps/code-server/docker-compose.yml diff --git a/README.md b/README.md index 9e2aabda..f1e8a843 100644 --- a/README.md +++ b/README.md @@ -13,6 +13,7 @@ Tipi is a personal homeserver orchestrator. It is running docker containers under the hood and provides a simple web interface to manage them. Every service comes with an opinionated configuration in order to remove the need for manual configuration and network setup. ## Apps available +- [Code-Server](https://github.com/filebrowser/filebrowser) - Web VS Code - [Filebrowser](https://github.com/filebrowser/filebrowser) - Web File Browser - [Freshrss](https://github.com/FreshRSS/FreshRSS) - A free, self-hostable RSS aggregator - [Invidious](https://github.com/iv-org/invidious) - An alternative front-end to YouTube diff --git a/apps/code-server/config.json b/apps/code-server/config.json new file mode 100644 index 00000000..c66f53ec --- /dev/null +++ b/apps/code-server/config.json @@ -0,0 +1,21 @@ +{ + "name": "Code-Server - Web VS Code", + "port": 8443, + "id": "code-server", + "description": "", + "short_desc": "Code-server is VS Code running on a remote server, accessible through the browser.", + "author": "https://github.com/coder", + "source": "https://github.com/linuxserver/docker-code-server", + "image": "https://avatars.githubusercontent.com/u/95932066", + "form_fields": { + "password": { + "type": "password", + "label": "Password", + "max": 50, + "min": 3, + "required": true, + "env_variable": "CODESERVER_PASSWORD" + } + } + } + \ No newline at end of file diff --git a/apps/code-server/docker-compose.yml b/apps/code-server/docker-compose.yml new file mode 100644 index 00000000..ec57273c --- /dev/null +++ b/apps/code-server/docker-compose.yml @@ -0,0 +1,20 @@ +--- +version: "2.1" +services: + code-server: + image: lscr.io/linuxserver/code-server:latest + container_name: code-server + environment: + - PUID=1000 + - PGID=1000 + - TZ=${TZ} + - PASSWORD=${CODESERVER_PASSWORD} + - DEFAULT_WORKSPACE=/config/workspace #optional + volumes: + - ${APP_DATA_DIR}/data/code-server/config:/config #config dir + - ${APP_DATA_DIR}/data/code-server/projects:/projects + ports: + - ${APP_PORT}:8443 + restart: unless-stopped + networks: + - tipi_main_network \ No newline at end of file diff --git a/packages/system-api/src/config/apps.ts b/packages/system-api/src/config/apps.ts index 31b64333..2b19a965 100644 --- a/packages/system-api/src/config/apps.ts +++ b/packages/system-api/src/config/apps.ts @@ -16,4 +16,5 @@ export const appNames = [ 'invidious', 'joplin', 'homarr', + 'code-server', ]; From 00c8c52afdd15ced09f7ba6f2bc1f332e7548b17 Mon Sep 17 00:00:00 2001 From: DrMxrcy Date: Thu, 19 May 2022 14:04:37 +0000 Subject: [PATCH 3/9] Added Calibre-Web and Fixed Code-Server --- README.md | 3 ++- apps/calibre-web/config.json | 12 ++++++++++++ apps/calibre-web/docker-compose.yml | 17 +++++++++++++++++ apps/code-server/docker-compose.yml | 1 - packages/system-api/src/config/apps.ts | 1 + 5 files changed, 32 insertions(+), 2 deletions(-) create mode 100644 apps/calibre-web/config.json create mode 100644 apps/calibre-web/docker-compose.yml diff --git a/README.md b/README.md index f1e8a843..b1fc1f7c 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,8 @@ Tipi is a personal homeserver orchestrator. It is running docker containers under the hood and provides a simple web interface to manage them. Every service comes with an opinionated configuration in order to remove the need for manual configuration and network setup. ## Apps available -- [Code-Server](https://github.com/filebrowser/filebrowser) - Web VS Code +- [Calibre-Web](https://github.com/janeczku/calibre-web) - Web Ebook Reader +- [Code-Server](https://github.com/filebrowser/filebrowser) - Web VS Code - [Filebrowser](https://github.com/filebrowser/filebrowser) - Web File Browser - [Freshrss](https://github.com/FreshRSS/FreshRSS) - A free, self-hostable RSS aggregator - [Invidious](https://github.com/iv-org/invidious) - An alternative front-end to YouTube diff --git a/apps/calibre-web/config.json b/apps/calibre-web/config.json new file mode 100644 index 00000000..abee77aa --- /dev/null +++ b/apps/calibre-web/config.json @@ -0,0 +1,12 @@ +{ + "name": "Calibre-Web - EBook Reader", + "port": 8083, + "id": "calibre-web", + "description": "On the initial setup screen, enter /books as your calibre library location. \n Default admin login: Username: admin Password: admin123", + "short_desc": "Calibre-web is a web app providing a clean interface for browsing, reading and downloading eBooks using an existing Calibre database. It is also possible to integrate google drive and edit metadata and your calibre library through the app itself.", + "author": "https://github.com/janeczku/", + "source": "https://github.com/janeczku/calibre-web", + "image": "https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/calibre-web-icon.png", + "form_fields": {} + } + \ No newline at end of file diff --git a/apps/calibre-web/docker-compose.yml b/apps/calibre-web/docker-compose.yml new file mode 100644 index 00000000..da4f5aeb --- /dev/null +++ b/apps/calibre-web/docker-compose.yml @@ -0,0 +1,17 @@ +version: "2.1" +services: + calibre-web: + image: lscr.io/linuxserver/calibre-web:latest + container_name: calibre-web + environment: + - PUID=1000 + - PGID=1000 + - TZ=${TZ} + volumes: + - ${APP_DATA_DIR}/data/calibre-web/config:/config + - ${APP_DATA_DIR}/data/calibre-web/books:/books + ports: + - ${APP_PORT}:8083 + restart: unless-stopped + networks: + - tipi_main_network \ No newline at end of file diff --git a/apps/code-server/docker-compose.yml b/apps/code-server/docker-compose.yml index ec57273c..8bbb7191 100644 --- a/apps/code-server/docker-compose.yml +++ b/apps/code-server/docker-compose.yml @@ -1,4 +1,3 @@ ---- version: "2.1" services: code-server: diff --git a/packages/system-api/src/config/apps.ts b/packages/system-api/src/config/apps.ts index 2b19a965..c5d005d7 100644 --- a/packages/system-api/src/config/apps.ts +++ b/packages/system-api/src/config/apps.ts @@ -17,4 +17,5 @@ export const appNames = [ 'joplin', 'homarr', 'code-server', + 'calibre-web', ]; From 6cbfb3aebe013f672ebe274104374b402f4493c6 Mon Sep 17 00:00:00 2001 From: DrMxrcy Date: Thu, 19 May 2022 14:07:05 +0000 Subject: [PATCH 4/9] Fixed Homarr Compose --- apps/homarr/docker-compose.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/apps/homarr/docker-compose.yml b/apps/homarr/docker-compose.yml index e69de29b..edeeae56 100644 --- a/apps/homarr/docker-compose.yml +++ b/apps/homarr/docker-compose.yml @@ -0,0 +1,12 @@ +version: '3' +services: + homarr: + container_name: homarr + image: ghcr.io/ajnart/homarr:latest + restart: unless-stopped + volumes: + - ${APP_DATA_DIR}/data/homarr:/app/data/configs + ports: + - ${APP_PORT}:7575 + networks: + - tipi_main_network \ No newline at end of file From 2fdf89b6cf8119eaceb82a2dc86509f90ee45770 Mon Sep 17 00:00:00 2001 From: DrMxrcy Date: Thu, 19 May 2022 19:13:43 +0000 Subject: [PATCH 5/9] Made Avaliable --- apps/calibre-web/config.json | 1 + apps/code-server/config.json | 1 + 2 files changed, 2 insertions(+) diff --git a/apps/calibre-web/config.json b/apps/calibre-web/config.json index abee77aa..b264f946 100644 --- a/apps/calibre-web/config.json +++ b/apps/calibre-web/config.json @@ -1,5 +1,6 @@ { "name": "Calibre-Web - EBook Reader", + "available": true, "port": 8083, "id": "calibre-web", "description": "On the initial setup screen, enter /books as your calibre library location. \n Default admin login: Username: admin Password: admin123", diff --git a/apps/code-server/config.json b/apps/code-server/config.json index c66f53ec..656b54ad 100644 --- a/apps/code-server/config.json +++ b/apps/code-server/config.json @@ -1,5 +1,6 @@ { "name": "Code-Server - Web VS Code", + "available": true, "port": 8443, "id": "code-server", "description": "", From 6b5d77f9a01fdef5dc4ee14301e0cc9aa1b23c94 Mon Sep 17 00:00:00 2001 From: DrMxrcy Date: Thu, 19 May 2022 19:40:19 +0000 Subject: [PATCH 6/9] Clean Up Calibre-Description --- apps/calibre-web/config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/calibre-web/config.json b/apps/calibre-web/config.json index b264f946..7aa299d6 100644 --- a/apps/calibre-web/config.json +++ b/apps/calibre-web/config.json @@ -4,7 +4,7 @@ "port": 8083, "id": "calibre-web", "description": "On the initial setup screen, enter /books as your calibre library location. \n Default admin login: Username: admin Password: admin123", - "short_desc": "Calibre-web is a web app providing a clean interface for browsing, reading and downloading eBooks using an existing Calibre database. It is also possible to integrate google drive and edit metadata and your calibre library through the app itself.", + "short_desc": "Calibre-web is a web app providing a clean interface for browsing, reading and downloading eBooks using an existing Calibre database.", "author": "https://github.com/janeczku/", "source": "https://github.com/janeczku/calibre-web", "image": "https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/calibre-web-icon.png", From 64be69deceabebf0f9039d0878d2c7733054df77 Mon Sep 17 00:00:00 2001 From: DrMxrcy Date: Thu, 19 May 2022 20:17:33 +0000 Subject: [PATCH 7/9] Calibre DB Copy --- .../data/calibre-web/book/metadata.db | Bin 0 -> 356352 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 apps/calibre-web/data/calibre-web/book/metadata.db diff --git a/apps/calibre-web/data/calibre-web/book/metadata.db b/apps/calibre-web/data/calibre-web/book/metadata.db new file mode 100644 index 0000000000000000000000000000000000000000..c32a5867d017c11ffa0dae52f6d60634439c7c2d GIT binary patch literal 356352 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 literal 0 HcmV?d00001 From a4429d52ad8283f48e21fe2153dc4895841625f3 Mon Sep 17 00:00:00 2001 From: DrMxrcy Date: Thu, 19 May 2022 20:19:59 +0000 Subject: [PATCH 8/9] Fix Path --- .../data/calibre-web/{book => books}/metadata.db | Bin 1 file changed, 0 insertions(+), 0 deletions(-) rename apps/calibre-web/data/calibre-web/{book => books}/metadata.db (100%) diff --git a/apps/calibre-web/data/calibre-web/book/metadata.db b/apps/calibre-web/data/calibre-web/books/metadata.db similarity index 100% rename from apps/calibre-web/data/calibre-web/book/metadata.db rename to apps/calibre-web/data/calibre-web/books/metadata.db From 0689b1dbffd1d4d0b7fe510b30520d6c3df55b40 Mon Sep 17 00:00:00 2001 From: Nicolas Meienberger Date: Fri, 20 May 2022 08:49:54 +0200 Subject: [PATCH 9/9] Fix PR commentsw --- apps/calibre-web/config.json | 23 ++++++----- .../data/{calibre-web => }/books/metadata.db | Bin apps/calibre-web/docker-compose.yml | 4 +- apps/code-server/config.json | 37 +++++++++--------- apps/code-server/docker-compose.yml | 4 +- apps/homarr/config.json | 4 +- apps/homarr/docker-compose.yml | 2 +- 7 files changed, 36 insertions(+), 38 deletions(-) rename apps/calibre-web/data/{calibre-web => }/books/metadata.db (100%) diff --git a/apps/calibre-web/config.json b/apps/calibre-web/config.json index 7aa299d6..6e19d314 100644 --- a/apps/calibre-web/config.json +++ b/apps/calibre-web/config.json @@ -1,13 +1,12 @@ { - "name": "Calibre-Web - EBook Reader", - "available": true, - "port": 8083, - "id": "calibre-web", - "description": "On the initial setup screen, enter /books as your calibre library location. \n Default admin login: Username: admin Password: admin123", - "short_desc": "Calibre-web is a web app providing a clean interface for browsing, reading and downloading eBooks using an existing Calibre database.", - "author": "https://github.com/janeczku/", - "source": "https://github.com/janeczku/calibre-web", - "image": "https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/calibre-web-icon.png", - "form_fields": {} - } - \ No newline at end of file + "name": "Calibre-Web - EBook Reader", + "available": true, + "port": 8100, + "id": "calibre-web", + "description": "On the initial setup screen, enter /books as your calibre library location. \n Default admin login: Username: admin Password: admin123", + "short_desc": "Calibre-web is a web app providing a clean interface for browsing, reading and downloading eBooks using an existing Calibre database.", + "author": "https://github.com/janeczku/", + "source": "https://github.com/janeczku/calibre-web", + "image": "https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/calibre-web-icon.png", + "form_fields": {} +} diff --git a/apps/calibre-web/data/calibre-web/books/metadata.db b/apps/calibre-web/data/books/metadata.db similarity index 100% rename from apps/calibre-web/data/calibre-web/books/metadata.db rename to apps/calibre-web/data/books/metadata.db diff --git a/apps/calibre-web/docker-compose.yml b/apps/calibre-web/docker-compose.yml index da4f5aeb..5b6225fe 100644 --- a/apps/calibre-web/docker-compose.yml +++ b/apps/calibre-web/docker-compose.yml @@ -8,8 +8,8 @@ services: - PGID=1000 - TZ=${TZ} volumes: - - ${APP_DATA_DIR}/data/calibre-web/config:/config - - ${APP_DATA_DIR}/data/calibre-web/books:/books + - ${APP_DATA_DIR}/data/config:/config + - ${APP_DATA_DIR}/data/books:/books ports: - ${APP_PORT}:8083 restart: unless-stopped diff --git a/apps/code-server/config.json b/apps/code-server/config.json index 656b54ad..1f106328 100644 --- a/apps/code-server/config.json +++ b/apps/code-server/config.json @@ -1,22 +1,21 @@ { - "name": "Code-Server - Web VS Code", - "available": true, - "port": 8443, - "id": "code-server", - "description": "", - "short_desc": "Code-server is VS Code running on a remote server, accessible through the browser.", - "author": "https://github.com/coder", - "source": "https://github.com/linuxserver/docker-code-server", - "image": "https://avatars.githubusercontent.com/u/95932066", - "form_fields": { - "password": { - "type": "password", - "label": "Password", - "max": 50, - "min": 3, - "required": true, - "env_variable": "CODESERVER_PASSWORD" - } + "name": "Code-Server - Web VS Code", + "available": true, + "port": 8101, + "id": "code-server", + "description": "", + "short_desc": "Code-server is VS Code running on a remote server, accessible through the browser.", + "author": "https://github.com/coder", + "source": "https://github.com/linuxserver/docker-code-server", + "image": "https://avatars.githubusercontent.com/u/95932066", + "form_fields": { + "password": { + "type": "password", + "label": "Password", + "max": 50, + "min": 3, + "required": true, + "env_variable": "CODESERVER_PASSWORD" } } - \ No newline at end of file +} diff --git a/apps/code-server/docker-compose.yml b/apps/code-server/docker-compose.yml index 8bbb7191..d2d72b9e 100644 --- a/apps/code-server/docker-compose.yml +++ b/apps/code-server/docker-compose.yml @@ -10,8 +10,8 @@ services: - PASSWORD=${CODESERVER_PASSWORD} - DEFAULT_WORKSPACE=/config/workspace #optional volumes: - - ${APP_DATA_DIR}/data/code-server/config:/config #config dir - - ${APP_DATA_DIR}/data/code-server/projects:/projects + - ${APP_DATA_DIR}/data/config:/config #config dir + - ${APP_DATA_DIR}/data/projects:/projects ports: - ${APP_PORT}:8443 restart: unless-stopped diff --git a/apps/homarr/config.json b/apps/homarr/config.json index 9c2bf7b3..8c7e97ce 100644 --- a/apps/homarr/config.json +++ b/apps/homarr/config.json @@ -1,13 +1,13 @@ { "name": "Homarr", "available": true, - "port": 7575, + "port": 8102, "id": "homarr", "description": "A homepage for your server.", "short_desc": "Homarr is a simple and lightweight homepage for your server, that helps you easily access all of your services in one place.", "author": "https://github.com/ajnart/", "source": "https://github.com/ajnart/homar", "website": "https://discord.gg/C2WTXkzkwK", - "image": "https://user-images.githubusercontent.com/49837342/168315259-b778c816-10fe-44db-bd25-3eea6f31b233.png", + "image": "https://raw.githubusercontent.com/ajnart/homarr/master/public/imgs/logo.png", "form_fields": {} } diff --git a/apps/homarr/docker-compose.yml b/apps/homarr/docker-compose.yml index edeeae56..9f374ab7 100644 --- a/apps/homarr/docker-compose.yml +++ b/apps/homarr/docker-compose.yml @@ -5,7 +5,7 @@ services: image: ghcr.io/ajnart/homarr:latest restart: unless-stopped volumes: - - ${APP_DATA_DIR}/data/homarr:/app/data/configs + - ${APP_DATA_DIR}/data/config:/app/data/configs ports: - ${APP_PORT}:7575 networks: