Merge pull request #63 from linuxserver/master-zip

install from zip

Dockerfile

@@ -10,47 +10,47 @@ LABEL maintainer="chbmb"
 ENV TZ="Etc/UTC"
 
 RUN \
- echo "**** install build packages ****" && \
- apk add --no-cache --virtual=build-dependencies \
-	g++ \
-	gcc \
-	libxml2-dev \
-	libxslt-dev \
-	py3-pip \
-	python3-dev && \
- echo "**** install packages ****" && \
- apk add --no-cache \
-	curl \
-	ffmpeg \
-	libxml2 \
-	libxslt \
-	python3 \
-	unrar \
-	unzip && \
- echo "**** install bazarr ****" && \
- if [ -z ${BAZARR_VERSION+x} ]; then \
-	BAZARR_VERSION=$(curl -sX GET "https://api.github.com/repos/morpheus65535/bazarr/releases/latest" \
-	| awk '/tag_name/{print $4;exit}' FS='[""]'); \
- fi && \
- curl -o \
- /tmp/bazarr.tar.gz -L \
-	"https://github.com/morpheus65535/bazarr/archive/${BAZARR_VERSION}.tar.gz" && \
- mkdir -p \
-	/app/bazarr/bin && \
- tar xf \
- /tmp/bazarr.tar.gz -C \
-	/app/bazarr/bin --strip-components=1 && \
- 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/bin/requirements.txt && \
- echo "**** clean up ****" && \
- apk del --purge \
-	build-dependencies && \
- rm -rf \
-	/root/.cache \
-	/tmp/*
+  echo "**** install build packages ****" && \
+  apk add --no-cache --virtual=build-dependencies \
+    g++ \
+    gcc \
+    libxml2-dev \
+    libxslt-dev \
+    py3-pip \
+    python3-dev && \
+  echo "**** install packages ****" && \
+  apk add --no-cache \
+    curl \
+    ffmpeg \
+    libxml2 \
+    libxslt \
+    python3 \
+    unrar \
+    unzip && \
+  echo "**** install bazarr ****" && \
+  if [ -z ${BAZARR_VERSION+x} ]; then \
+    BAZARR_VERSION=$(curl -sX GET "https://api.github.com/repos/morpheus65535/bazarr/releases/latest" \
+    | awk '/tag_name/{print $4;exit}' FS='[""]'); \
+  fi && \
+  curl -o \
+    /tmp/bazarr.zip -L \
+    "https://github.com/morpheus65535/bazarr/releases/download/${BAZARR_VERSION}/bazarr.zip" && \
+  mkdir -p \
+    /app/bazarr/bin && \
+  unzip \
+    /tmp/bazarr.zip -d \
+    /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/bin/requirements.txt && \
+  echo "**** clean up ****" && \
+  apk del --purge \
+    build-dependencies && \
+  rm -rf \
+    /root/.cache \
+    /tmp/*
 
 # add local files
 COPY root/ /

Dockerfile.aarch64

@@ -10,47 +10,47 @@ LABEL maintainer="chbmb"
 ENV TZ="Etc/UTC"
 
 RUN \
- echo "**** install build packages ****" && \
- apk add --no-cache --virtual=build-dependencies \
-	g++ \
-	gcc \
-	libxml2-dev \
-	libxslt-dev \
-	py3-pip \
-	python3-dev && \
- echo "**** install packages ****" && \
- apk add --no-cache \
-	curl \
-	ffmpeg \
-	libxml2 \
-	libxslt \
-	python3 \
-	unrar \
-	unzip && \
- echo "**** install bazarr ****" && \
- if [ -z ${BAZARR_VERSION+x} ]; then \
-	BAZARR_VERSION=$(curl -sX GET "https://api.github.com/repos/morpheus65535/bazarr/releases/latest" \
-	| awk '/tag_name/{print $4;exit}' FS='[""]'); \
- fi && \
- curl -o \
- /tmp/bazarr.tar.gz -L \
-	"https://github.com/morpheus65535/bazarr/archive/${BAZARR_VERSION}.tar.gz" && \
- mkdir -p \
-	/app/bazarr/bin && \
- tar xf \
- /tmp/bazarr.tar.gz -C \
-	/app/bazarr/bin --strip-components=1 && \
- 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/bin/requirements.txt && \
- echo "**** clean up ****" && \
- apk del --purge \
-	build-dependencies && \
- rm -rf \
-	/root/.cache \
-	/tmp/*
+  echo "**** install build packages ****" && \
+  apk add --no-cache --virtual=build-dependencies \
+    g++ \
+    gcc \
+    libxml2-dev \
+    libxslt-dev \
+    py3-pip \
+    python3-dev && \
+  echo "**** install packages ****" && \
+  apk add --no-cache \
+    curl \
+    ffmpeg \
+    libxml2 \
+    libxslt \
+    python3 \
+    unrar \
+    unzip && \
+  echo "**** install bazarr ****" && \
+  if [ -z ${BAZARR_VERSION+x} ]; then \
+    BAZARR_VERSION=$(curl -sX GET "https://api.github.com/repos/morpheus65535/bazarr/releases/latest" \
+    | awk '/tag_name/{print $4;exit}' FS='[""]'); \
+  fi && \
+  curl -o \
+    /tmp/bazarr.zip -L \
+    "https://github.com/morpheus65535/bazarr/releases/download/${BAZARR_VERSION}/bazarr.zip" && \
+  mkdir -p \
+    /app/bazarr/bin && \
+  unzip \
+    /tmp/bazarr.zip -d \
+    /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/bin/requirements.txt && \
+  echo "**** clean up ****" && \
+  apk del --purge \
+    build-dependencies && \
+  rm -rf \
+    /root/.cache \
+    /tmp/*
 
 # add local files
 COPY root/ /

Dockerfile.armhf

@@ -10,47 +10,47 @@ LABEL maintainer="chbmb"
 ENV TZ="Etc/UTC"
 
 RUN \
- echo "**** install build packages ****" && \
- apk add --no-cache --virtual=build-dependencies \
-	g++ \
-	gcc \
-	libxml2-dev \
-	libxslt-dev \
-	py3-pip \
-	python3-dev && \
- echo "**** install packages ****" && \
- apk add --no-cache \
-	curl \
-	ffmpeg \
-	libxml2 \
-	libxslt \
-	python3 \
-	unrar \
-	unzip && \
- echo "**** install bazarr ****" && \
- if [ -z ${BAZARR_VERSION+x} ]; then \
-	BAZARR_VERSION=$(curl -sX GET "https://api.github.com/repos/morpheus65535/bazarr/releases/latest" \
-	| awk '/tag_name/{print $4;exit}' FS='[""]'); \
- fi && \
- curl -o \
- /tmp/bazarr.tar.gz -L \
-	"https://github.com/morpheus65535/bazarr/archive/${BAZARR_VERSION}.tar.gz" && \
- mkdir -p \
-	/app/bazarr/bin && \
- tar xf \
- /tmp/bazarr.tar.gz -C \
-	/app/bazarr/bin --strip-components=1 && \
- 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/bin/requirements.txt && \
- echo "**** clean up ****" && \
- apk del --purge \
-	build-dependencies && \
- rm -rf \
-	/root/.cache \
-	/tmp/*
+  echo "**** install build packages ****" && \
+  apk add --no-cache --virtual=build-dependencies \
+    g++ \
+    gcc \
+    libxml2-dev \
+    libxslt-dev \
+    py3-pip \
+    python3-dev && \
+  echo "**** install packages ****" && \
+  apk add --no-cache \
+    curl \
+    ffmpeg \
+    libxml2 \
+    libxslt \
+    python3 \
+    unrar \
+    unzip && \
+  echo "**** install bazarr ****" && \
+  if [ -z ${BAZARR_VERSION+x} ]; then \
+    BAZARR_VERSION=$(curl -sX GET "https://api.github.com/repos/morpheus65535/bazarr/releases/latest" \
+    | awk '/tag_name/{print $4;exit}' FS='[""]'); \
+  fi && \
+  curl -o \
+    /tmp/bazarr.zip -L \
+    "https://github.com/morpheus65535/bazarr/releases/download/${BAZARR_VERSION}/bazarr.zip" && \
+  mkdir -p \
+    /app/bazarr/bin && \
+  unzip \
+    /tmp/bazarr.zip -d \
+    /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/bin/requirements.txt && \
+  echo "**** clean up ****" && \
+  apk del --purge \
+    build-dependencies && \
+  rm -rf \
+    /root/.cache \
+    /tmp/*
 
 # add local files
 COPY root/ /

README.md

@@ -238,6 +238,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **19.04.21:** - Install from release zip.
 * **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.

readme-vars.yml

@@ -45,6 +45,7 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "19.04.21:", desc: "Install from release zip." }
   - { 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." }

root/etc/cont-init.d/30-config

@@ -2,4 +2,4 @@
 
 # permissions
 chown -R abc:abc \
-	/config
+    /config

root/etc/services.d/bazarr/run

@@ -1,10 +1,10 @@
 #!/usr/bin/with-contenv bash
 
 if [ -n "${UMASK_SET}" ] && [ -z "${UMASK}" ]; then
-  echo -e "You are using a legacy method of defining umask\nplease update your environment variable from UMASK_SET to UMASK\nto keep the functionality after July 2021"
-  umask ${UMASK_SET}
+    echo -e "You are using a legacy method of defining umask\nplease update your environment variable from UMASK_SET to UMASK\nto keep the functionality after July 2021"
+    umask ${UMASK_SET}
 fi
 
 exec \
-	s6-setuidgid abc python3 /app/bazarr/bin/bazarr.py \
-	--no-update --config /config
+    s6-setuidgid abc python3 /app/bazarr/bin/bazarr.py \
+    --no-update --config /config