diff --git a/apps/movary/config.json b/apps/movary/config.json index fa359944..190d0d66 100644 --- a/apps/movary/config.json +++ b/apps/movary/config.json @@ -5,7 +5,7 @@ "available": true, "exposable": true, "id": "movary", - "tipi_version": 15, + "tipi_version": 24, "version": "0.57.0", "categories": [ "media" @@ -23,9 +23,15 @@ }, { "type": "random", - "label": "MySQL Root Password", + "label": "Plex Identifier", "min": 32, - "env_variable": "MOVARY_MYSQL_ROOT_PASSWORD" + "env_variable": "MOVARY_PLEX_IDENTIFIER" + }, + { + "type": "random", + "label": "Plex Identifier", + "min": 32, + "env_variable": "MOVARY_JELLYFIN_IDENTIFIER" }, { "type": "text", @@ -36,3 +42,5 @@ } ] } + + diff --git a/apps/movary/docker-compose.yml b/apps/movary/docker-compose.yml index 3bbf472d..d52fdffa 100644 --- a/apps/movary/docker-compose.yml +++ b/apps/movary/docker-compose.yml @@ -16,14 +16,17 @@ services: - DATABASE_MYSQL_USER=tipi - DATABASE_MYSQL_PASSWORD=${MOVARY_MYSQL_PASSWORD} - TMDB_ENABLE_IMAGE_CACHING=1 + - APPLICATION_URL=${APP_PROTOCOL:-http}://${APP_DOMAIN} + - PLEX_IDENTIFIER=${MOVARY_PLEX_IDENTIFIER} + - JELLYFIN_DEVICE_ID=${MOVARY_JELLYFIN_IDENTIFIER} restart: unless-stopped - command: "php bin/console.php database:migration:migrate" volumes: - ${APP_DATA_DIR}/data/movary:/app/storage ports: - ${APP_PORT}:80 depends_on: - - movary-db + movary-db: + condition: service_healthy networks: - tipi_main_network labels: @@ -51,16 +54,50 @@ services: traefik.http.routers.movary-local.entrypoints: websecure traefik.http.routers.movary-local.service: movary traefik.http.routers.movary-local.tls: true + + movary-migration: + image: leepeuker/movary:0.57.0 + container_name: movary-migration + command: php bin/console.php database:migration:migrate + user: ${TIPI_UID}:${TIPI_GID} + group_add: + - ${TIPI_GID} + environment: + - TMDB_API_KEY=${MOVARY_TMDB_API_KEY} + - TIMEZONE=${TZ} + - DATABASE_MODE=mysql + - DATABASE_MYSQL_HOST=movary-db + - DATABASE_MYSQL_NAME=movary + - DATABASE_MYSQL_USER=tipi + - DATABASE_MYSQL_PASSWORD=${MOVARY_MYSQL_PASSWORD} + - TMDB_ENABLE_IMAGE_CACHING=1 + - APPLICATION_URL=${APP_PROTOCOL:-http}://${APP_DOMAIN} + - PLEX_IDENTIFIER=${MOVARY_PLEX_IDENTIFIER} + - JELLYFIN_DEVICE_ID=${MOVARY_JELLYFIN_IDENTIFIER} + volumes: + - ${APP_DATA_DIR}/data/movary:/app/storage + depends_on: + movary-db: + condition: service_healthy + networks: + - tipi_main_network movary-db: image: mysql:8.0 container_name: movary-db + user: ${TIPI_UID}:${TIPI_GID} + group_add: + - ${TIPI_GID} environment: MYSQL_DATABASE: "movary" MYSQL_USER: "tipi" MYSQL_PASSWORD: ${MOVARY_MYSQL_PASSWORD} - MYSQL_ROOT_PASSWORD: ${MOVARY_MYSQL_ROOT_PASSWORD} + MYSQL_ROOT_PASSWORD: ${MOVARY_MYSQL_PASSWORD} volumes: - - ${APP_DATA_DIR}/data/mysql:/config + - ${APP_DATA_DIR}/data/mysql:/var/lib/mysql networks: - tipi_main_network + healthcheck: + test: ["CMD", "mysqladmin", "ping", "-h", "localhost"] + timeout: 20s + retries: 10 diff --git a/apps/movary/metadata/logo.jpg b/apps/movary/metadata/logo.jpg index f9ae6318..c22d78ec 100644 Binary files a/apps/movary/metadata/logo.jpg and b/apps/movary/metadata/logo.jpg differ