Merge branch 'master' of https://github.com/meienberger/runtipi-appstore

2023-03-28 23:42:29 +02:00 · 2023-03-28 23:42:29 +02:00 · 1078f02f54
commit 1078f02f54
parent ad25de1ffb 311205cac8
10 changed files with 64 additions and 28 deletions
--- a/apps/bazarr/config.json
+++ b/apps/bazarr/config.json
@ -5,9 +5,12 @@
  "exposable": true,
  "port": 6767,
  "id": "bazarr",
-  "tipi_version": 3,
-  "version": "1.1.2",
-  "categories": ["media", "utilities"],
+  "tipi_version": 4,
+  "version": "1.2.0",
+  "categories": [
+    "media",
+    "utilities"
+  ],
  "description": "Bazarr is a companion application to Sonarr and Radarr that manages and downloads subtitles based on your requirements.",
  "short_desc": "A companion application to Sonarr and Radarr that manages and downloads subtitles",
  "author": "morpheus65535",
--- a/apps/bazarr/docker-compose.yml
+++ b/apps/bazarr/docker-compose.yml
@ -1,7 +1,7 @@
 version: "3.7"
 services:
  bazarr:
-    image: lscr.io/linuxserver/bazarr:1.1.2
+    image: lscr.io/linuxserver/bazarr:1.2.0
    container_name: bazarr
    environment:
      - PUID=1000
--- a/apps/grafana/config.json
+++ b/apps/grafana/config.json
@ -5,9 +5,11 @@
  "available": true,
  "exposable": true,
  "id": "grafana",
-  "tipi_version": 1,
-  "version": "9.4.3",
-  "categories": ["data"],
+  "tipi_version": 2,
+  "version": "9.4.7",
+  "categories": [
+    "data"
+  ],
  "description": "The open and composable observability and data visualization platform",
  "short_desc": "The open and composable observability and data visualization platform",
  "author": "Grafana Labs",
--- a/apps/grafana/docker-compose.yml
+++ b/apps/grafana/docker-compose.yml
@ -3,7 +3,7 @@ version: "3"
 services:
  grafana:
    container_name: grafana
-    image: grafana/grafana-oss:9.4.3
+    image: grafana/grafana-oss:9.4.7
    ports:
      - ${APP_PORT}:3000
    volumes:
--- a/apps/immich/config.json
+++ b/apps/immich/config.json
@ -5,8 +5,8 @@
  "exposable": true,
  "port": 8128,
  "id": "immich",
-  "tipi_version": 2,
-  "version": "v1.50.1",
+  "tipi_version": 3,
+  "version": "v1.51.2",
  "categories": ["data", "photography"],
  "description": "Photo and video backup solution directly from your mobile phone.",
  "short_desc": "Photo and video backup solution directly from your mobile phone.",
@ -25,6 +25,12 @@
      "label": "JWT_SECRET",
      "min": 32,
      "env_variable": "JWT_SECRET"
+    },
+    {
+      "type": "random",
+      "label": "IMMICH_TYPESENSE_API_KEY",
+      "min": 32,
+      "env_variable": "IMMICH_TYPESENSE_API_KEY"
    }
  ]
 }
--- a/apps/immich/docker-compose.yml
+++ b/apps/immich/docker-compose.yml
@ -3,13 +3,16 @@ version: "3.7"
 services:
  immich:
    container_name: immich
-    image: altran1502/immich-proxy:v1.50.1
+    image: altran1502/immich-proxy:v1.51.2
    ports:
      - ${APP_PORT}:8080
    depends_on:
-      - immich-web
      - immich-server
    restart: unless-stopped
+    environment:
+      - IMMICH_WEB_URL=http://immich-web:3000
+      - IMMICH_SERVER_URL=http://immich-server:3001
+     # - IMMICH_MACHINE_LEARNING_URL="http://immich-machine-learning:3003"
    networks:
      - tipi_main_network
    labels:
@ -22,7 +25,7 @@ services:

  immich-server:
    container_name: immich-server
-    image: altran1502/immich-server:v1.50.1
+    image: altran1502/immich-server:v1.51.2
    entrypoint: ["/bin/sh", "./start-server.sh"]
    volumes:
      - ${ROOT_FOLDER_HOST}/media/data/images/immich:/usr/src/app/upload
@ -35,16 +38,19 @@ services:
      - DB_DATABASE_NAME=immich
      - REDIS_HOSTNAME=immich-redis
      - JWT_SECRET=${JWT_SECRET}
+      - TYPESENSE_HOST=immich-typesense
+      - TYPESENSE_API_KEY=${IMMICH_TYPESENSE_API_KEY}
    depends_on:
      - immich-redis
      - immich-db
+      - immich-typesense
    restart: unless-stopped
    networks:
      - tipi_main_network

  immich-microservices:
    container_name: immich-microservices
-    image: altran1502/immich-server:v1.50.1
+    image: altran1502/immich-server:v1.51.2
    entrypoint: ["/bin/sh", "./start-microservices.sh"]
    volumes:
      - ${ROOT_FOLDER_HOST}/media/data/images/immich:/usr/src/app/upload
@ -57,19 +63,22 @@ services:
      - REDIS_HOSTNAME=immich-redis
      - JWT_SECRET=${JWT_SECRET}
      - ENABLE_MAPBOX=false
+      - TYPESENSE_HOST=immich-typesense
+      - TYPESENSE_API_KEY=${IMMICH_TYPESENSE_API_KEY}
    depends_on:
      - immich-redis
      - immich-db
+      - immich-typesense
    restart: unless-stopped
    networks:
      - tipi_main_network

  immich-machine-learning:
    container_name: immich-machine-learning
-    image: altran1502/immich-machine-learning:v1.50.1
-    entrypoint: ["/bin/sh", "./entrypoint.sh"]
+    image: altran1502/immich-machine-learning:v1.51.2
    volumes:
      - ${ROOT_FOLDER_HOST}/media/data/images/immich:/usr/src/app/upload
+      - ${APP_DATA_DIR}/data/immich-ml-cache:/cache
    environment:
      - NODE_ENV=production
      - DB_HOSTNAME=immich-db
@ -77,6 +86,8 @@ services:
      - DB_PASSWORD=${DB_PASSWORD}
      - DB_NAME=immich
      - DB_DATABASE_NAME=immich
+      - TYPESENSE_HOST=immich-typesense
+      - TYPESENSE_API_KEY=${IMMICH_TYPESENSE_API_KEY}
    depends_on:
      - immich-db
    restart: unless-stopped
@ -85,7 +96,7 @@ services:

  immich-web:
    container_name: immich-web
-    image: altran1502/immich-web:v1.50.1
+    image: altran1502/immich-web:v1.51.2
    entrypoint: ["/bin/sh", "./entrypoint.sh"]
    restart: unless-stopped
    networks:
@ -111,7 +122,17 @@ services:
    restart: unless-stopped
    networks:
      - tipi_main_network
-
  
-    
-
+  immich-typesense:
+    container_name: immich-typesense
+    image: typesense/typesense:0.24.0
+    environment:
+      - TYPESENSE_API_KEY=${IMMICH_TYPESENSE_API_KEY}
+      - TYPESENSE_DATA_DIR=/data
+    logging:
+      driver: none
+    volumes:
+      - ${APP_DATA_DIR}/data/typesense:/data
+    restart: always
+    networks:
+      - tipi_main_network
--- a/apps/jellyfin/config.json
+++ b/apps/jellyfin/config.json
@ -5,9 +5,11 @@
  "exposable": true,
  "port": 8091,
  "id": "jellyfin",
-  "tipi_version": 4,
-  "version": "10.8.7",
-  "categories": ["media"],
+  "tipi_version": 5,
+  "version": "10.8.9",
+  "categories": [
+    "media"
+  ],
  "description": "Jellyfin is a Free Software Media System that puts you in control of managing and streaming your media. It is an alternative to the proprietary Emby and Plex, to provide media from a dedicated server to end-user devices via multiple apps. Jellyfin is descended from Emby's 3.5.2 release and ported to the .NET Core framework to enable full cross-platform support. There are no strings attached, no premium licenses or features, and no hidden agendas: just a team who want to build something better and work together to achieve it. We welcome anyone who is interested in joining us in our quest!",
  "short_desc": "A media server for your home collection",
  "author": "jellyfin.org",
--- a/apps/jellyfin/docker-compose.yml
+++ b/apps/jellyfin/docker-compose.yml
@ -1,7 +1,7 @@
 version: "3.7"
 services:
  jellyfin:
-    image: lscr.io/linuxserver/jellyfin:10.8.7
+    image: lscr.io/linuxserver/jellyfin:10.8.9
    container_name: jellyfin
    volumes:
      - ${APP_DATA_DIR}/data/config:/config
--- a/apps/wikijs/config.json
+++ b/apps/wikijs/config.json
@ -5,9 +5,11 @@
  "available": true,
  "exposable": true,
  "id": "wikijs",
-  "tipi_version": 1,
-  "version": "2.5.297",
-  "categories": ["media"],
+  "tipi_version": 2,
+  "version": "2.5.298",
+  "categories": [
+    "media"
+  ],
  "description": "A modern, lightweight and powerful wiki app built on NodeJS ",
  "short_desc": "A modern and powerful wiki app built on Node.js",
  "author": "https://github.com/requarks",
--- a/apps/wikijs/docker-compose.yml
+++ b/apps/wikijs/docker-compose.yml
@ -3,7 +3,7 @@ version: '3.7'
 services:
  wikijs:
    container_name: wikijs
-    image: ghcr.io/requarks/wiki:2.5.297
+    image: ghcr.io/requarks/wiki:2.5.298
    depends_on:
      - wikijs-db
    environment: