update

StudioEtrange · Mar 24, 2020 · 10cff6f · 10cff6f
1 parent 30d1817
commit 10cff6f
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 22 deletions.
diff --git a/README.md b/README.md
@@ -300,6 +300,7 @@ L     shell <service> : launch a shell into a running service
 
 ### JDownloader2
 
+* create an account on https://my.jdownloader.org/ and install a browser extension
 * set `JDOWNLOADER2_EMAIL` and `JDOWNLOADER2_PASSWORD` variables before launch
 * you can see your instance at https://my.jdownloader.org/
 
@@ -469,7 +470,7 @@ https://github.com/causefx/Organizr/issues/1240
 ## MAMBO ADDONS
 
 
-* declare addons
+* declare used addons
 
     * ie in user env file : 
         ```

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -108,13 +108,18 @@ x-service-disable: &service-disable
 # https://forums.docker.com/t/is-there-any-way-to-use-extension-fields-in-docker-compose-with-docker-secrets/68602
 x-calibreweb: &default-calibreweb
   image: studioetrange/calibre-web:${CALIBRE_WEB_VERSION:-latest}
+  #container_name: mambo_tautulli
   depends_on: 
     - service_init
   restart: unless-stopped
+  #volumes:
   environment:
     - PUID=${MAMBO_USER_ID:-0}
     - PGID=${MAMBO_GROUP_ID:-0}
     - DOCKER_MODS=studioetrange/calibre-mod:${CALIBRE_VERSION:-latest}
+  labels:
+    - "mambo.managed=true"
+    - "traefik.enable=true"
   networks:
     - default
   expose:
@@ -578,7 +583,7 @@ services:
     volumes:
       # will contain plex configuration
       - plex_data:/config
-      - media:/media
+      #- media:/media
       - ${PLEX_TRANSCODE_PATH}:/transcode
     environment:
       - PLEX_UID=${MAMBO_USER_ID:-0}
@@ -791,10 +796,15 @@ services:
   #     # different paths used by calibreweb
   #     - calibreweb_books_media:/books
   #   labels:
-  #     - "traefik.enable=true"
-  #     - "traefik.http.routers.calibreweb_books.entrypoints=web_secondary"
+  #     - "traefik.http.routers.calibreweb_books.entrypoints=${CALIBRE_ENTRYPOINTS:-web_main}"
   #     - "traefik.http.routers.calibreweb_books.rule=HostRegexp(`{subdomain:calibreweb_books}.{domain:${MAMBO_DOMAIN:-.*}}`) || HostRegexp(`{domain:${MAMBO_DOMAIN:-.*}}`) && PathPrefix(`/calibreweb_books`)"
   #     - "traefik.http.routers.calibreweb_books.service=calibreweb_books"
+  #     - "traefik.http.routers.calibreweb_books.priority=${CALIBRE_ENTRYPOINTS:-200}"
+  #     - "traefik.http.routers.calibreweb_books-secure.entrypoints=${CALIBRE_ENTRYPOINTS_SECURE:-web_main_secure}"
+  #     - "traefik.http.routers.calibreweb_books-secure.rule=HostRegexp(`{subdomain:calibreweb_books}.{domain:${MAMBO_DOMAIN:-.*}}`)"
+  #     - "traefik.http.routers.calibreweb_books-secure.service=calibreweb_books"
+  #     - "traefik.http.routers.calibreweb_books-secure.tls=true"
+  #     - "traefik.http.routers.calibreweb_books-secure.tls.domains[0].main=calibreweb_books.${MAMBO_DOMAIN:-.*}"
   #     - "traefik.http.services.calibreweb_books.loadbalancer.server.port=8083"
   #     - "traefik.http.services.calibreweb_books.loadbalancer.server.scheme=http"
   #     - "traefik.http.services.calibreweb_books.loadbalancer.passhostheader=true"

diff --git a/env.default b/env.default
@@ -162,7 +162,7 @@ PLEX_CLIENT_FORCE_TRANSCODE_UPSCALE=0
 # default : 60
 PLEX_TRANSCODER_THROTTLE_BUFFER=150
 # Select HTTPS mode to access to plex service
-# NOTE : do not change this - we manage HTTP/HTTPS through traefik - from traefik to plex we use HTTP - tautulli seems to cannot connect to HTTPS plex within docker network
+# NOTE : do not change this - we manage HTTP/HTTPS with traefik - from traefik to plex we use HTTP - tautulli seems to cannot connect to HTTPS plex within docker network
 # 0 : Required
 # 1 : Preferred
 # 2 : Disabled

diff --git a/mambo b/mambo
@@ -217,13 +217,14 @@ __add_service_direct_port_access_all() {
 }
 
 
-# add bind mount media volume mapped inside named volume /media
+# add a media_xxx named volume defintion
+# attach this media_xxx named volume to a /media/xxxx folder to each service listed in MAMBO_MEDIA_SERVICES
 __add_volume_media_all() {
 	for f in ${MAMBO_MEDIA_FOLDERS}; do
 		f="$($STELLA_API rel_to_abs_path "${f}" "${STELLA_APP_ROOT}")"
 		target="$(basename "${f}")"
 		if [ -f "${f}" ]; then 
-			echo "** [${f}] is a file, not mounted inside {/media}"
+			echo "** [${f}] is a file, not mounted inside folder {/media}"
 		else
 			[ ! -d "${f}" ] && echo "** [${f}] is not an existing directory and will be auto created."
 			__name="$($STELLA_API md5 "${f}")"
@@ -772,13 +773,13 @@ case $ACTION in
 				;;
 			addons )
 				echo "** Init service Mambo addons"
-				docker-compose -f "${DOCKER_COMPOSE_FILE_GENERATED}" --project-directory "${STELLA_APP_ROOT}" up addons
+				docker-compose -f "${DOCKER_COMPOSE_FILE_GENERATED}" --project-name mambo --project-directory "${STELLA_APP_ROOT}" up addons
 				;;
 			* )
 				echo "** Init service Plex"
 				__init_service_plex
 				echo "** Init service Mambo addons"
-				docker-compose -f "${DOCKER_COMPOSE_FILE_GENERATED}" --project-directory "${STELLA_APP_ROOT}" up addons
+				docker-compose -f "${DOCKER_COMPOSE_FILE_GENERATED}" --project-name mambo --project-directory "${STELLA_APP_ROOT}" up addons
 				;;
 		esac
 	;;
@@ -792,7 +793,7 @@ case $ACTION in
 				echo "L-- X-Plex-Token : $(__get_plex_x_plex_auth_token "${PLEX_USER}" "${PLEX_PASSWORD}")"
 			;;
 			* )
-			docker-compose ${DOCKER_COMPOSE_LOG} -f "${DOCKER_COMPOSE_FILE_GENERATED}" --project-directory "${STELLA_APP_ROOT}" up service_init
+			docker-compose ${DOCKER_COMPOSE_LOG} -f "${DOCKER_COMPOSE_FILE_GENERATED}" --project-name mambo --project-directory "${STELLA_APP_ROOT}" up service_init
 			;;
 		esac
 
@@ -802,49 +803,49 @@ case $ACTION in
 
 	up )
 		# NOTE we need to specify project directory because when launching from an other directory, docker compose seems to NOT auto load .env file
-		docker-compose ${DOCKER_COMPOSE_LOG} -f "${DOCKER_COMPOSE_FILE_GENERATED}" --project-directory "${STELLA_APP_ROOT}" up ${DAEMON} ${TARGET:-mambo}
+		docker-compose ${DOCKER_COMPOSE_LOG} -f "${DOCKER_COMPOSE_FILE_GENERATED}" --project-name mambo --project-directory "${STELLA_APP_ROOT}" up ${DAEMON} ${TARGET:-mambo}
 		if [ "${DAEMON}" = "" ]; then
-			[ "${TARGET}" = "" ] && docker-compose -f "${DOCKER_COMPOSE_FILE_GENERATED}" --project-directory "${STELLA_APP_ROOT}" logs service_init
+			[ "${TARGET}" = "" ] && docker-compose -f "${DOCKER_COMPOSE_FILE_GENERATED}" --project-name mambo --project-directory "${STELLA_APP_ROOT}" logs service_init
 		else
-			docker-compose ${DOCKER_COMPOSE_LOG} -f "${DOCKER_COMPOSE_FILE_GENERATED}" --project-directory "${STELLA_APP_ROOT}" logs service_init
+			docker-compose ${DOCKER_COMPOSE_LOG} -f "${DOCKER_COMPOSE_FILE_GENERATED}" --project-name mambo --project-directory "${STELLA_APP_ROOT}" logs service_init
 		fi
 	;;
 
 	down )
 		case "${TARGET}" in
 			"") 
-				docker-compose ${DOCKER_COMPOSE_LOG} -f "${DOCKER_COMPOSE_FILE_GENERATED}" --project-directory "${STELLA_APP_ROOT}" down -v 
+				docker-compose ${DOCKER_COMPOSE_LOG} -f "${DOCKER_COMPOSE_FILE_GENERATED}" --project-name mambo --project-directory "${STELLA_APP_ROOT}" down -v 
 			;;
 			*) 
-				docker-compose ${DOCKER_COMPOSE_LOG} -f "${DOCKER_COMPOSE_FILE_GENERATED}" --project-directory "${STELLA_APP_ROOT}" stop ${TARGET}
+				docker-compose ${DOCKER_COMPOSE_LOG} -f "${DOCKER_COMPOSE_FILE_GENERATED}" --project-name mambo --project-directory "${STELLA_APP_ROOT}" stop ${TARGET}
 			;;
 		esac
 	;;
 
 	restart )
 		case "${TARGET}" in
 		"") 
-			docker-compose ${DOCKER_COMPOSE_LOG} -f "${DOCKER_COMPOSE_FILE_GENERATED}" --project-directory "${STELLA_APP_ROOT}" down -v 
+			docker-compose ${DOCKER_COMPOSE_LOG} -f "${DOCKER_COMPOSE_FILE_GENERATED}" --project-name mambo --project-directory "${STELLA_APP_ROOT}" down -v 
 		;;
 		*) 
-			docker-compose ${DOCKER_COMPOSE_LOG} -f "${DOCKER_COMPOSE_FILE_GENERATED}" --project-directory "${STELLA_APP_ROOT}" stop ${TARGET}
+			docker-compose ${DOCKER_COMPOSE_LOG} -f "${DOCKER_COMPOSE_FILE_GENERATED}" --project-name mambo --project-directory "${STELLA_APP_ROOT}" stop ${TARGET}
 		;;
 		esac
-		docker-compose ${DOCKER_COMPOSE_LOG} -f "${DOCKER_COMPOSE_FILE_GENERATED}" --project-directory "${STELLA_APP_ROOT}" up ${DAEMON} ${TARGET:-mambo}
+		docker-compose ${DOCKER_COMPOSE_LOG} -f "${DOCKER_COMPOSE_FILE_GENERATED}" --project-name mambo --project-directory "${STELLA_APP_ROOT}" up ${DAEMON} ${TARGET:-mambo}
 		if [ "${DAEMON}" = "" ]; then
-			[ "${TARGET}" = "" ] && docker-compose ${DOCKER_COMPOSE_LOG} -f "${DOCKER_COMPOSE_FILE_GENERATED}" --project-directory "${STELLA_APP_ROOT}" logs service_init
+			[ "${TARGET}" = "" ] && docker-compose ${DOCKER_COMPOSE_LOG} -f "${DOCKER_COMPOSE_FILE_GENERATED}" --project-name mambo --project-directory "${STELLA_APP_ROOT}" logs service_init
 		else
-			docker-compose ${DOCKER_COMPOSE_LOG} -f "${DOCKER_COMPOSE_FILE_GENERATED}" --project-directory "${STELLA_APP_ROOT}" logs service_init
+			docker-compose ${DOCKER_COMPOSE_LOG} -f "${DOCKER_COMPOSE_FILE_GENERATED}" --project-name mambo --project-directory "${STELLA_APP_ROOT}" logs service_init
 		fi
 
 	;;
 
 	status )
-		docker-compose -f "${DOCKER_COMPOSE_FILE_GENERATED}" ${DOCKER_COMPOSE_LOG} --project-directory "${STELLA_APP_ROOT}" ps ${TARGET}
+		docker-compose ${DOCKER_COMPOSE_LOG} -f "${DOCKER_COMPOSE_FILE_GENERATED}" --project-name mambo --project-directory "${STELLA_APP_ROOT}" ps ${TARGET}
 	;;
 
 	logs )
-		docker-compose -f "${DOCKER_COMPOSE_FILE_GENERATED}" ${DOCKER_COMPOSE_LOG} --project-directory "${STELLA_APP_ROOT}" logs -t ${TARGET}
+		docker-compose ${DOCKER_COMPOSE_LOG} -f "${DOCKER_COMPOSE_FILE_GENERATED}" --project-name mambo --project-directory "${STELLA_APP_ROOT}" logs -t ${TARGET}
 	;;
 esac