Merge pull request #259 from pabloromeo/dev

Upgrading EAE to version 1983
pabloromeo · Sep 20, 2023 · b6afeff · b6afeff
2 parents 7a3de87 + 9d32955
commit b6afeff
Show file tree

Hide file tree

Showing 2 changed files with 88 additions and 87 deletions.
diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -1,91 +1,91 @@
-version: '3.8'
+version: "3.8"
 
 services:
-  plex:
-    container_name: plex
-    build:
-      context: ./pms
-      dockerfile: ./extended-image/Dockerfile-development
-    environment:
-      VERSION: docker
-      PUID: ${PUID}
-      PGID: ${PGID}
-      TZ: ${TZ}
-      ORCHESTRATOR_URL: http://plex-orchestrator:3500
-      PMS_SERVICE: plex     # This service. If you disable Local Relay then you must use PMS_IP instead
-      PMS_PORT: "32400"
-      TRANSCODE_OPERATING_MODE: both #(local|remote|both)
-      TRANSCODER_VERBOSE: "1"   # 1=verbose, 0=silent
-      LOCAL_RELAY_ENABLED: "1"
-      LOCAL_RELAY_PORT: "32499"
-    healthcheck:
-      test: curl -fsS http://localhost:32400/identity > /dev/null || exit 1
-      interval: 15s
-      timeout: 15s
-      retries: 5
-      start_period: 30s
-    volumes:
-      - plex-config:/config
-      - transcode-volume:/transcode
-      - ./sample-content/tv:/data/tv
-      - ./sample-content/movies:/data/movies
-    ports:
-      - 32499:32499   # LOCAL_RELAY_PORT
-      - 32400:32400
-      - 3005:3005
-      - 8324:8324
-      - 1900:1900/udp
-      - 32410:32410/udp
-      - 32412:32412/udp
-      - 32413:32413/udp
-      - 32414:32414/udp
+    plex:
+        container_name: plex
+        build:
+            context: ./pms
+            dockerfile: ./extended-image/Dockerfile-development
+        environment:
+            VERSION: docker
+            PUID: ${PUID}
+            PGID: ${PGID}
+            TZ: ${TZ}
+            ORCHESTRATOR_URL: http://plex-orchestrator:3500
+            PMS_SERVICE: plex # This service. If you disable Local Relay then you must use PMS_IP instead
+            PMS_PORT: "32400"
+            TRANSCODE_OPERATING_MODE: both #(local|remote|both)
+            TRANSCODER_VERBOSE: "1" # 1=verbose, 0=silent
+            LOCAL_RELAY_ENABLED: "1"
+            LOCAL_RELAY_PORT: "32499"
+        healthcheck:
+            test: curl -fsS http://localhost:32400/identity > /dev/null || exit 1
+            interval: 15s
+            timeout: 15s
+            retries: 5
+            start_period: 30s
+        volumes:
+            - plex-config:/config
+            - transcode-volume:/transcode
+            - ./sample-content/tv:/data/tv
+            - ./sample-content/movies:/data/movies
+        ports:
+            - 32499:32499 # LOCAL_RELAY_PORT
+            - 32400:32400
+            - 3005:3005
+            - 8324:8324
+            - 1900:1900/udp
+            - 32410:32410/udp
+            - 32412:32412/udp
+            - 32413:32413/udp
+            - 32414:32414/udp
 
-  plex-orchestrator:
-    container_name: plex-orchestrator
-    build: ./orchestrator
-    healthcheck:
-      test: curl -fsS http://localhost:3500/health > /dev/null || exit 1
-      interval: 15s
-      timeout: 15s
-      retries: 5
-      start_period: 30s
-    environment:
-      TZ: ${TZ}
-      LISTENING_PORT: 3500
-      WORKER_SELECTION_STRATEGY: "LOAD_RANK" # RR | LOAD_CPU | LOAD_TASKS | LOAD_RANK (default)
-    volumes:
-      - /etc/localtime:/etc/localtime:ro
-    ports:
-      - 3500:3500
+    plex-orchestrator:
+        container_name: plex-orchestrator
+        build: ./orchestrator
+        healthcheck:
+            test: curl -fsS http://localhost:3500/health > /dev/null || exit 1
+            interval: 15s
+            timeout: 15s
+            retries: 5
+            start_period: 30s
+        environment:
+            TZ: ${TZ}
+            LISTENING_PORT: 3500
+            WORKER_SELECTION_STRATEGY: "LOAD_RANK" # RR | LOAD_CPU | LOAD_TASKS | LOAD_RANK (default)
+        volumes:
+            - /etc/localtime:/etc/localtime:ro
+        ports:
+            - 3500:3500
 
-  plex-worker:
-    build:
-      context: ./worker
-      dockerfile: ./extended-image/Dockerfile-development
-    deploy:
-      mode: replicated
-      replicas: 1
-    environment:
-      VERSION: docker
-      PUID: 1000
-      PGID: 1000
-      TZ: ${TZ}
-      LISTENING_PORT: 3501      # used by the healthcheck
-      STAT_CPU_INTERVAL: 2000   # interval for reporting worker load metrics
-      ORCHESTRATOR_URL: http://plex-orchestrator:3500
-      EAE_SUPPORT: "1"
-    healthcheck:
-      test: curl -fsS http://localhost:3501/health > /dev/null || exit 1
-      interval: 15s
-      timeout: 15s
-      retries: 5
-      start_period: 240s
-    volumes:
-      - codecs:/codecs
-      - ./sample-content/tv:/data/tv
-      - ./sample-content/movies:/data/movies
-      - transcode-volume:/transcode
+    plex-worker:
+        build:
+            context: ./worker
+            dockerfile: ./extended-image/Dockerfile-development
+        deploy:
+            mode: replicated
+            replicas: 1
+        environment:
+            VERSION: docker
+            PUID: 1000
+            PGID: 1000
+            TZ: ${TZ}
+            LISTENING_PORT: 3501 # used by the healthcheck
+            STAT_CPU_INTERVAL: 2000 # interval for reporting worker load metrics
+            ORCHESTRATOR_URL: http://plex-orchestrator:3500
+            EAE_SUPPORT: "1"
+        healthcheck:
+            test: curl -fsS http://localhost:3501/health > /dev/null || exit 1
+            interval: 15s
+            timeout: 15s
+            retries: 5
+            start_period: 240s
+        volumes:
+            - codecs:/codecs
+            - ./sample-content/tv:/data/tv
+            - ./sample-content/movies:/data/movies
+            - transcode-volume:/transcode
 volumes:
-  plex-config:
-  transcode-volume:
-  codecs:
+    plex-config:
+    transcode-volume:
+    codecs:
diff --git a/worker/app/start.sh b/worker/app/start.sh
@@ -5,7 +5,8 @@ cd /usr/lib/plexmediaserver
 CLUSTERPLEX_PLEX_VERSION=$(strings "pms_original" | grep -P '^([0-9]+)\.([0-9]+)\.([0-9]+)\.([0-9]+)-[0-9a-f]{9}')
 CLUSTERPLEX_PLEX_CODECS_VERSION=$(strings "Plex Transcoder" | grep -Po '[0-9a-f]{7}-[0-9]{4}$')
 CLUSTERPLEX_PLEX_EAE_VERSION=$(printf "eae-`strings "pms_original" | grep -P '^EasyAudioEncoder-eae-[0-9a-f]{7}-$' | cut -d- -f3`-42")
-EAE_VERSION=1978 # fixed for now
+
+EAE_VERSION="${EAE_VERSION_NUMBER:=1983}" # default fixed for now
 
 echo "CLUSTERPLEX_PLEX_VERSION => '${CLUSTERPLEX_PLEX_VERSION}'"
 echo "CLUSTERPLEX_PLEX_CODECS_VERSION => '${CLUSTERPLEX_PLEX_CODECS_VERSION}'"