diff --git a/.gitmodules b/.gitmodules index 6b09d5b..a3428a0 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,3 @@ [submodule "balena-rpiplay"] path = balena-rpiplay url = https://github.com/rahul-thakoor/balena-rpiplay.git -[submodule "plex"] - path = plex - url = https://github.com/linuxserver/docker-plex.git diff --git a/README.md b/README.md index 3b479ec..3f20533 100644 --- a/README.md +++ b/README.md @@ -14,11 +14,19 @@ Docker compose for my Raspberry Pi 3B running balena os x64 I forgot the password to my old HA instance, so I bought a nice, new, and shiny 128GB Samsung A2 card and used [balenaEtcher](https://www.balena.io/etcher/) to write the balena os to it. I then spent two days finding the right combination to get both [balena-homeassistant](https://github.com/balenalabs-incubator/balena-homeassistant) and [balena-rpiplay](https://github.com/rahul-thakoor/balena-rpiplay) working in tandem. ## Changelog +### Version 1.5.0 +**2022-10-28**: + - Removed Plex + - Attempt auto-launching [browser](https://github.com/balenablocks/browser) to point to local Plex web ### Version 1.4.11 -- 2022-10-27: Attempt to add Plex +**2022-10-27**: + - Attempt to add Plex ### Version 1.3.0 -- 2022-10-27: Removed RPIPlay +**2022-10-27**: + - Removed RPIPlay ### Version 1.2.0 -- 2022-07-01: Added RPIPlay +**2022-07-01**: + - Added RPIPlay ### Version 1.0.0 -- 2022-06-30: Initial commit \ No newline at end of file +**2022-06-30**: + - Initial commit \ No newline at end of file diff --git a/VERSION b/VERSION index 079d7f6..bc80560 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.4.11 +1.5.0 diff --git a/balena.yml b/balena.yml index 31a964a..7af9e9f 100644 --- a/balena.yml +++ b/balena.yml @@ -28,4 +28,4 @@ data: - PLEX_CLAIM_TOKEN: "" - PLEX_ADVERTISE_IP: "" - PLEX_TZ: "America/Chicago" -version: 1.4.11 +version: 1.5.0 diff --git a/docker-compose.yml b/docker-compose.yml index 5a0da17..cb5dbfb 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,8 +2,7 @@ version: '2.1' volumes: config: {} mosquitto: {} - plexdb: {} - plex: {} + settings: {} services: homeassistant: build: @@ -41,36 +40,12 @@ services: restart: always depends_on: - homeassistant - plex: - build: - context: plex2 + browser: + image: 'balenablocks/browser-aarch64' # where is one of aarch64, arm32 or amd64 + privileged: true # required for UDEV to find plugged in peripherals such as a USB mouse network_mode: host - ports: - - '80:32400' - - '1900:1900' - - '3005:3005' - - '5353:5353' - - '8324:8324' - - '32410:32410' - - '32412:32412' - - '32413:32413' - - '32414:32414' - - '32469:32469' - container_name: plex - privileged: true - volumes: - - plexdb:/config - - plex:/transcode restart: always - environment: - PUID: 911 - PGID: 911 - DBUS_SYSTEM_BUS_ADDRESS: unix:path=/host/run/dbus/system_bus_socket - devices: - - /dev/dri - - /dev/vchiq - group_add: - - video - - audio - labels: - io.balena.features.dbus: '1' \ No newline at end of file + ports: + - '5011' # management API (optional) + volumes: + - 'settings:/data' \ No newline at end of file diff --git a/plex b/plex deleted file mode 160000 index 58f30bb..0000000 --- a/plex +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 58f30bba5a7b5e0938a542091f5ad45f763992dd diff --git a/plex2/Dockerfile b/plex2/Dockerfile deleted file mode 100644 index 107815f..0000000 --- a/plex2/Dockerfile +++ /dev/null @@ -1,11 +0,0 @@ -FROM linuxserver/plex:arm64v8-latest - -COPY mount.sh / - -RUN chmod a+x /mount.sh - -RUN chmod +x /etc/s6-overlay/s6-rc.d/init-plex-chown/run - -ENTRYPOINT [ "/bin/sh" ] - -CMD [ "-c", "/mount.sh" ] \ No newline at end of file diff --git a/plex2/mount.sh b/plex2/mount.sh deleted file mode 100644 index 765df90..0000000 --- a/plex2/mount.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh - -PUID=${PUID:-911} -PGID=${PGID:-911} - -for uuid in $(blkid -sUUID -ovalue /dev/sd??) -do - mkdir -v /media/"${uuid}" 2>/dev/null - mount -v UUID="${uuid}" /media/"${uuid}" || exit 1 - chown -v "${PUID}:${PGID}" /media/"${uuid}" -done - -exit 0 \ No newline at end of file