move app to /app/bazarr/bin, add package_info

Dockerfile

@@ -36,14 +36,15 @@ RUN \
  /tmp/bazarr.tar.gz -L \
 	"https://github.com/morpheus65535/bazarr/archive/${BAZARR_VERSION}.tar.gz" && \
  mkdir -p \
-	/app/bazarr && \
+	/app/bazarr/bin && \
  tar xf \
  /tmp/bazarr.tar.gz -C \
-	/app/bazarr --strip-components=1 && \
+	/app/bazarr/bin --strip-components=1 && \
- rm -Rf /app/bazarr/bin && \
+ rm -Rf /app/bazarr/bin/bin && \
+ echo "UpdateMethod=docker\nBranch=master\nPackageVersion=${VERSION}\nPackageAuthor=[linuxserver.io](https://linuxserver.io)" > /app/bazarr/package_info && \
  echo "**** Install requirements ****" && \
  pip3 install --no-cache-dir -U  -r \
-	/app/bazarr/requirements.txt && \
+	/app/bazarr/bin/requirements.txt && \
  echo "**** clean up ****" && \
  apk del --purge \
 	build-dependencies && \

Dockerfile.aarch64

@@ -36,14 +36,15 @@ RUN \
  /tmp/bazarr.tar.gz -L \
 	"https://github.com/morpheus65535/bazarr/archive/${BAZARR_VERSION}.tar.gz" && \
  mkdir -p \
-	/app/bazarr && \
+	/app/bazarr/bin && \
  tar xf \
  /tmp/bazarr.tar.gz -C \
-	/app/bazarr --strip-components=1 && \
+	/app/bazarr/bin --strip-components=1 && \
- rm -Rf /app/bazarr/bin && \
+ rm -Rf /app/bazarr/bin/bin && \
+ echo "UpdateMethod=docker\nBranch=master\nPackageVersion=${VERSION}\nPackageAuthor=[linuxserver.io](https://linuxserver.io)" > /app/bazarr/package_info && \
  echo "**** Install requirements ****" && \
  pip3 install --no-cache-dir -U  -r \
-	/app/bazarr/requirements.txt && \
+	/app/bazarr/bin/requirements.txt && \
  echo "**** clean up ****" && \
  apk del --purge \
 	build-dependencies && \

Dockerfile.armhf

@@ -36,14 +36,15 @@ RUN \
  /tmp/bazarr.tar.gz -L \
 	"https://github.com/morpheus65535/bazarr/archive/${BAZARR_VERSION}.tar.gz" && \
  mkdir -p \
-	/app/bazarr && \
+	/app/bazarr/bin && \
  tar xf \
  /tmp/bazarr.tar.gz -C \
-	/app/bazarr --strip-components=1 && \
+	/app/bazarr/bin --strip-components=1 && \
- rm -Rf /app/bazarr/bin && \
+ rm -Rf /app/bazarr/bin/bin && \
+ echo "UpdateMethod=docker\nBranch=master\nPackageVersion=${VERSION}\nPackageAuthor=[linuxserver.io](https://linuxserver.io)" > /app/bazarr/package_info && \
  echo "**** Install requirements ****" && \
  pip3 install --no-cache-dir -U  -r \
-	/app/bazarr/requirements.txt && \
+	/app/bazarr/bin/requirements.txt && \
  echo "**** clean up ****" && \
  apk del --purge \
 	build-dependencies && \

README.md

@@ -56,6 +56,14 @@ The architectures supported by this image are:
 | arm64 | arm64v8-latest |
 | armhf | arm32v7-latest |
 
+## Version Tags
+
+This image provides various versions that are available via tags. `latest` tag usually provides the latest stable version. Others are considered under development and caution must be exercised when using them.
+
+| Tag | Description |
+| :----: | --- |
+| latest | Stable releases from Bazarr |
+| development | Pre-releases from Bazarr |
 
 ## Usage
 
@@ -77,9 +85,9 @@ services:
       - PGID=1000
       - TZ=Europe/London
     volumes:
-      - </path/to/bazarr/config>:/config
+      - /path/to/bazarr/config:/config
-      - </path/to/movies>:/movies
+      - /path/to/movies:/movies #optional
-      - </path/to/tv>:/tv
+      - /path/to/tv:/tv #optional
     ports:
       - 6767:6767
     restart: unless-stopped
@@ -94,18 +102,13 @@ docker run -d \
   -e PGID=1000 \
   -e TZ=Europe/London \
   -p 6767:6767 \
-  -v </path/to/bazarr/config>:/config \
+  -v /path/to/bazarr/config:/config \
-  -v </path/to/movies>:/movies \
+  -v /path/to/movies:/movies `#optional` \
-  -v </path/to/tv>:/tv \
+  -v /path/to/tv:/tv `#optional` \
   --restart unless-stopped \
   ghcr.io/linuxserver/bazarr
 ```
 
-You can choose between ,using tags, various branch versions of bazarr, no tag is required to remain on the main branch.
-Add one of the tags,  if required,  to the linuxserver/bazarr line of the run/create command in the following format, linuxserver/bazarr:development
-The development tag will be the latest commit in the development branch of bazarr.
-HOWEVER , USE THE DEVELOPMENT BRANCH AT YOUR OWN PERIL !!!!!!!!!
-
 
 ## Parameters
 
@@ -230,6 +233,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **07.04.21:** - Move app to /app/bazarr/bin, add `package_info`.
 * **23.01.21:** - Rebasing to alpine 3.13.
 * **23.01.21:** - Deprecate `UMASK_SET` in favor of UMASK in baseimage, see above for more information.
 * **01.06.20:** - Rebasing to alpine 3.12.

readme-vars.yml

@@ -13,22 +13,17 @@ available_architectures:
   - { arch: "{{ arch_arm64 }}", tag: "arm64v8-latest"}
   - { arch: "{{ arch_armhf }}", tag: "arm32v7-latest"}
 
-# Optional Block
+  # development version
-optional_block_1: true
+development_versions: true
-optional_block_1_items:
+development_versions_items:
-  - |
+  - { tag: "latest", desc: "Stable releases from Bazarr" }
-    You can choose between ,using tags, various branch versions of bazarr, no tag is required to remain on the main branch.
+  - { tag: "development", desc: "Pre-releases from Bazarr" }
-    Add one of the tags,  if required,  to the linuxserver/bazarr line of the run/create command in the following format, linuxserver/bazarr:development
-    The development tag will be the latest commit in the development branch of bazarr.
-    HOWEVER , USE THE DEVELOPMENT BRANCH AT YOUR OWN PERIL !!!!!!!!!
 
 # container parameters
 param_container_name: "{{ project_name }}"
 param_usage_include_vols: true
 param_volumes:
-  - { vol_path: "/config", vol_host_path: "</path/to/bazarr/config>", desc: "Bazarr data" }
+  - { vol_path: "/config", vol_host_path: "/path/to/bazarr/config", desc: "Bazarr data" }
-  - { vol_path: "/movies", vol_host_path: "</path/to/movies>", desc: "Location of your movies" }
-  - { vol_path: "/tv", vol_host_path: "</path/to/tv>", desc: "Location of your TV Shows" }
 param_usage_include_ports: true
 param_ports:
   - { external_port: "6767", internal_port: "6767", port_desc: "Allows HTTP access to the internal webserver." }
@@ -37,6 +32,10 @@ param_env_vars:
   - { env_var: "TZ", env_value: "Europe/London", desc: "Specify a timezone to use EG Europe/London"}
 # optional env variables
 opt_param_usage_include_env: false
+opt_param_usage_include_vols: true
+opt_param_volumes:
+  - { vol_path: "/movies", vol_host_path: "/path/to/movies", desc: "Location of your movies" }
+  - { vol_path: "/tv", vol_host_path: "/path/to/tv", desc: "Location of your TV Shows" }
 
 # application setup block
 app_setup_block_enabled: true
@@ -46,6 +45,7 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "07.04.21:", desc: "Move app to /app/bazarr/bin, add `package_info`." }
   - { date: "23.01.21:", desc: "Rebasing to alpine 3.13." }
   - { date: "23.01.21:", desc: "Deprecate `UMASK_SET` in favor of UMASK in baseimage, see above for more information." }
   - { date: "01.06.20:", desc: "Rebasing to alpine 3.12." }

root/etc/services.d/bazarr/run

@@ -6,5 +6,5 @@ if [ -n "${UMASK_SET}" ] && [ -z "${UMASK}" ]; then
 fi
 
 exec \
-	s6-setuidgid abc python3 /app/bazarr/bazarr.py \
+	s6-setuidgid abc python3 /app/bazarr/bin/bazarr.py \
 	--no-update --config /config