Bot Updating Templated Files

Switching to new Base images, shift to arm32v7 tag.

Dockerfile

@@ -1,4 +1,195 @@
-FROM lsiobase/alpine:3.8
+ARG ALPINE_VER="3.9"
+FROM lsiobase/alpine:${ALPINE_VER} as fetch-stage
+
+############## fetch stage ##############
+
+# package versions
+ARG MP3GAIN_VER="1.6.2"
+
+# install fetch packages
+RUN \
+ apk add --no-cache \
+	bash \
+	curl \
+	git \
+	jq \
+	unzip
+
+# set shell
+SHELL ["/bin/bash", "-o", "pipefail", "-c"]
+
+# fetch source code
+RUN \
+ set -ex && \
+ mkdir -p \
+	/tmp/beets-src \
+	/tmp/mp3gain-src && \
+ if [ -z ${BEETS_VERSION+x} ] ; then \
+ BEETS_RAW_COMMIT=$(curl -sX GET "https://api.github.com/repos/beetbox/beets/commits/master" \
+	| jq -r .sha) && \
+ BEETS_VERSION="${BEETS_RAW_COMMIT:0:7}"; \
+ fi && \
+ curl -o \
+ /tmp/beets.tar.gz -L \
+	"https://github.com/sampsyo/beets/archive/${BEETS_VERSION}.tar.gz" && \
+ curl -o \
+ /tmp/mp3gain.zip -L \
+	"https://sourceforge.net/projects/mp3gain/files/mp3gain/${MP3GAIN_VER}/mp3gain-${MP3GAIN_VER//./_}-src.zip" && \
+ tar xf \
+ /tmp/beets.tar.gz -C \
+	/tmp/beets-src --strip-components=1 && \
+ unzip -q /tmp/mp3gain.zip -d /tmp/mp3gain-src && \
+ git clone https://bitbucket.org/acoustid/chromaprint.git /tmp/chromaprint-src && \
+ git clone https://github.com/sbarakat/beets-copyartifacts.git /tmp/copyartifacts-src
+
+FROM lsiobase/alpine:${ALPINE_VER} as beets_build-stage
+
+############## beets build stage ##############
+
+# copy artifacts from fetch stage
+COPY --from=fetch-stage /tmp/beets-src /tmp/beets-src
+COPY --from=fetch-stage /tmp/copyartifacts-src /tmp/copyartifacts-src
+
+# set workdir for beets install
+WORKDIR /tmp/beets-src
+
+# install build packages
+RUN \
+ apk add --no-cache \
+	py3-setuptools \
+	python3-dev
+
+# build beets package
+RUN \
+ set -ex && \
+ python3 setup.py build && \
+ python3 setup.py install --prefix=/usr --root=/build/beets
+
+# set workdir for copyartifacts install
+WORKDIR /tmp/copyartifacts-src
+
+# build copyartifacts package
+RUN \
+ set -ex && \
+ python3 setup.py install --prefix=/usr --root=/build/beets
+
+FROM alpine:${ALPINE_VER} as mp3gain_build-stage
+
+############## mp3gain build stage ##############
+
+# copy artifacts from fetch stage
+COPY --from=fetch-stage /tmp/mp3gain-src /tmp/mp3gain-src
+
+# set workdir
+WORKDIR /tmp/mp3gain-src
+
+# install build packages
+RUN \
+ apk add --no-cache \
+	g++ \
+	make \
+	mpg123-dev
+
+# build package
+RUN \
+ set -ex && \
+ mkdir -p \
+	/build/mp3gain/usr/bin && \
+ sed -i "s#/usr/local/bin#/build/mp3gain/usr/bin#g" Makefile && \
+ make && \
+ make install
+
+FROM lsiobase/alpine:${ALPINE_VER} as chromaprint_build-stage
+
+############## chromaprint build stage ##############
+
+# copy artifacts from fetch stage
+COPY --from=fetch-stage /tmp/chromaprint-src /tmp/chromaprint-src
+
+# set workdir
+WORKDIR /tmp/chromaprint-src
+
+# install build packages
+RUN \
+ apk add --no-cache \
+	cmake \
+	ffmpeg-dev \
+	fftw-dev \
+	g++ \
+	make
+
+# build package
+RUN \
+ set -ex && \
+ cmake \
+	-DBUILD_TOOLS=ON \
+	-DCMAKE_BUILD_TYPE=Release \
+	-DCMAKE_INSTALL_PREFIX:PATH=/usr && \
+ make && \
+ make DESTDIR=/build/chromaprint install
+
+FROM lsiobase/alpine:${ALPINE_VER} as pip-stage
+
+############## pip packages install stage ##############
+
+# install build packages
+RUN \
+ apk add --no-cache \
+	g++ \
+	make \
+	py3-pip \
+	python3-dev
+
+# install pip packages
+RUN \
+ set -ex && \
+ pip3 install --no-cache-dir -U \
+	discogs-client \
+	mutagen \
+	pyacoustid \
+	pyyaml \
+	unidecode
+
+FROM lsiobase/alpine:${ALPINE_VER} as strip-stage
+
+############## strip packages stage ##############
+
+# copy artifacts build stages
+COPY --from=beets_build-stage /build/beets/usr/ /build/all//usr/
+COPY --from=chromaprint_build-stage /build/chromaprint/usr/ /build/all//usr/
+COPY --from=mp3gain_build-stage /build/mp3gain/usr/ /build/all//usr/
+COPY --from=pip-stage /usr/lib/python3.6/site-packages /build/all/usr/lib/python3.6/site-packages
+
+# install strip packages
+RUN \
+ apk add --no-cache \
+	bash \
+	binutils
+
+# set shell
+SHELL ["/bin/bash", "-o", "pipefail", "-c"]
+
+# strip packages
+RUN \
+	set -ex && \
+ for dirs in usr/bin usr/lib usr/lib/python3.6/site-packages; \
+	do \
+		find /build/all/"${dirs}" -type f | \
+		while read -r files ; do strip "${files}" || true \
+		; done \
+	; done
+
+# remove unneeded files
+RUN \	
+	set -ex && \
+ for cleanfiles in *.la *.pyc *.pyo; \
+	do \
+		find /build/all/ -iname "${cleanfiles}" -exec rm -vf '{}' + \
+	; done
+
+FROM lsiobase/alpine:${ALPINE_VER}
+
+############## runtime stage ##############
 
 # set version label
 ARG BUILD_DATE
@@ -7,89 +198,36 @@ ARG BEETS_VERSION
 LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
 LABEL maintainer="sparklyballs"
 
+# copy artifacts strip stage
+COPY --from=strip-stage /build/all/usr/  /usr/
+
+# install runtime packages
 RUN \
- echo "**** install build packages ****" && \
- apk add --no-cache --virtual=build-dependencies --upgrade \
-	cmake \
-	ffmpeg-dev \
-	fftw-dev \
-	g++ \
-	gcc \
-	git \
-	jpeg-dev \
-	libpng-dev \
-	make \
-	mpg123-dev \
-	openjpeg-dev \
-	python3-dev && \
- echo "**** install runtime packages ****" && \
- apk add --no-cache --upgrade \
+ apk add --no-cache \
 	curl \
-	expat \
 	ffmpeg \
-	ffmpeg-libs \
 	fftw \
-	gdbm \
-	gst-plugins-good \
-	gstreamer \
-	jpeg \
-	jq \
-	lame \
-	libffi \
-	libpng \
 	mpg123 \
 	nano \
-	openjpeg \
-	py3-gobject3 \
+	jq \
+	lame \
+	nano \
+	py3-beautifulsoup4 \
+	py3-flask \
+	py3-jellyfish \
+	py3-munkres \
+	py3-musicbrainzngs \
+	py3-pillow \
 	py3-pip \
 	py3-pylast \
+	py3-requests \
+	py3-setuptools \
+	py3-six \
+	py-enum34 \
 	python3 \
 	sqlite-libs \
 	tar \
-	wget && \
- echo "**** compile mp3gain ****" && \
- mkdir -p \
-	/tmp/mp3gain-src && \
- curl -o \
- /tmp/mp3gain-src/mp3gain.zip -L \
-	https://sourceforge.net/projects/mp3gain/files/mp3gain/1.6.1/mp3gain-1_6_1-src.zip && \
- cd /tmp/mp3gain-src && \
- unzip -qq /tmp/mp3gain-src/mp3gain.zip && \
- sed -i "s#/usr/local/bin#/usr/bin#g" /tmp/mp3gain-src/Makefile && \
- make && \
- make install && \
- echo "**** compile chromaprint ****" && \
- git clone https://bitbucket.org/acoustid/chromaprint.git \
-	/tmp/chromaprint && \
- cd /tmp/chromaprint && \
- cmake \
-	-DBUILD_TOOLS=ON \
-	-DCMAKE_BUILD_TYPE=Release \
-	-DCMAKE_INSTALL_PREFIX:PATH=/usr && \
- make && \
- make install && \
- echo "**** install pip packages ****" && \
- if [ -z ${BEETS_VERSION+x} ]; then \
-	BEETS_VERSION=$(curl -sL  https://pypi.python.org/pypi/beets/json \
-	|jq -r '. | .info.version'); \
- fi && \
- pip3 install --no-cache-dir -U \
-	beautifulsoup4 \
-	beets==${BEETS_VERSION} \
-	beets-copyartifacts \
-	discogs-client \
-	flask \
-	pillow \
-	pip \
-	pyacoustid \
-	requests \
-	unidecode && \
- echo "**** cleanup ****" && \
- apk del --purge \
-	build-dependencies && \
- rm -rf \
-	/root/.cache \
-	/tmp/*
+	wget
 
 # environment settings
 ENV BEETSDIR="/config" \

Dockerfile.aarch64

@@ -1,7 +1,199 @@
-FROM lsiobase/alpine.arm64:3.8
+ARG ALPINE_VER="3.9"
+FROM lsiobase/alpine:arm64v8-${ALPINE_VER} as fetch-stage
 
-# Add qemu to build on x86_64 systems
-COPY qemu-aarch64-static /usr/bin
+############## fetch stage ##############
+
+# package versions
+ARG MP3GAIN_VER="1.6.2"
+
+# install fetch packages
+RUN \
+ apk add --no-cache \
+	bash \
+	curl \
+	git \
+	jq \
+	unzip
+
+# set shell
+SHELL ["/bin/bash", "-o", "pipefail", "-c"]
+
+# fetch source code
+RUN \
+ set -ex && \
+ mkdir -p \
+	/tmp/beets-src \
+	/tmp/mp3gain-src && \
+ if [ -z ${BEETS_VERSION+x} ] ; then \
+ BEETS_RAW_COMMIT=$(curl -sX GET "https://api.github.com/repos/beetbox/beets/commits/master" \
+	| jq -r .sha) && \
+ BEETS_VERSION="${BEETS_RAW_COMMIT:0:7}"; \
+ fi && \
+ curl -o \
+ /tmp/beets.tar.gz -L \
+	"https://github.com/sampsyo/beets/archive/${BEETS_VERSION}.tar.gz" && \
+ curl -o \
+ /tmp/mp3gain.zip -L \
+	"https://sourceforge.net/projects/mp3gain/files/mp3gain/${MP3GAIN_VER}/mp3gain-${MP3GAIN_VER//./_}-src.zip" && \
+ tar xf \
+ /tmp/beets.tar.gz -C \
+	/tmp/beets-src --strip-components=1 && \
+ unzip -q /tmp/mp3gain.zip -d /tmp/mp3gain-src && \
+ git clone https://bitbucket.org/acoustid/chromaprint.git /tmp/chromaprint-src && \
+ git clone https://github.com/sbarakat/beets-copyartifacts.git /tmp/copyartifacts-src
+
+FROM lsiobase/alpine:arm64v8-${ALPINE_VER} as beets_build-stage
+
+############## beets build stage ##############
+
+# set workdir for beets install
+WORKDIR /tmp/beets-src
+
+# install build packages
+RUN \
+ apk add --no-cache \
+	py3-setuptools \
+	python3-dev
+
+# copy artifacts from fetch stage and apply bandaid
+COPY --from=fetch-stage /tmp/beets-src /tmp/beets-src
+COPY --from=fetch-stage /tmp/copyartifacts-src /tmp/copyartifacts-src
+COPY bandaid/aarch64/ /usr/lib/
+
+# build beets package
+RUN \
+ set -ex && \
+ python3 setup.py build && \
+ python3 setup.py install --prefix=/usr --root=/build/beets
+
+# set workdir for copyartifacts install
+WORKDIR /tmp/copyartifacts-src
+
+# build copyartifacts package
+RUN \
+ set -ex && \
+ python3 setup.py install --prefix=/usr --root=/build/beets
+
+FROM alpine:${ALPINE_VER} as mp3gain_build-stage
+
+############## mp3gain build stage ##############
+
+# copy artifacts from fetch stage
+COPY --from=fetch-stage /tmp/mp3gain-src /tmp/mp3gain-src
+
+# set workdir
+WORKDIR /tmp/mp3gain-src
+
+# install build packages
+RUN \
+ apk add --no-cache \
+	g++ \
+	make \
+	mpg123-dev
+
+# build package
+RUN \
+ set -ex && \
+ mkdir -p \
+	/build/mp3gain/usr/bin && \
+ sed -i "s#/usr/local/bin#/build/mp3gain/usr/bin#g" Makefile && \
+ make && \
+ make install
+
+FROM lsiobase/alpine:arm64v8-${ALPINE_VER} as chromaprint_build-stage
+
+############## chromaprint build stage ##############
+
+# copy artifacts from fetch stage
+COPY --from=fetch-stage /tmp/chromaprint-src /tmp/chromaprint-src
+
+# set workdir
+WORKDIR /tmp/chromaprint-src
+
+# install build packages
+RUN \
+ apk add --no-cache \
+	cmake \
+	ffmpeg-dev \
+	fftw-dev \
+	g++ \
+	make
+
+# build package
+RUN \
+ set -ex && \
+ cmake \
+	-DBUILD_TOOLS=ON \
+	-DCMAKE_BUILD_TYPE=Release \
+	-DCMAKE_INSTALL_PREFIX:PATH=/usr && \
+ make && \
+ make DESTDIR=/build/chromaprint install
+
+FROM lsiobase/alpine:arm64v8-${ALPINE_VER} as pip-stage
+
+############## pip packages install stage ##############
+
+# install build packages
+RUN \
+ apk add --no-cache \
+	g++ \
+	make \
+	py3-pip \
+	python3-dev
+
+# apply bandaid
+COPY bandaid/aarch64/ /usr/lib/
+
+# install pip packages
+RUN \
+ set -ex && \
+ pip3 install --no-cache-dir -U \
+	discogs-client \
+	mutagen \
+	pyacoustid \
+	pyyaml \
+	unidecode
+
+FROM lsiobase/alpine:arm64v8-${ALPINE_VER} as strip-stage
+
+############## strip packages stage ##############
+
+# copy artifacts build stages
+COPY --from=beets_build-stage /build/beets/usr/ /build/all//usr/
+COPY --from=chromaprint_build-stage /build/chromaprint/usr/ /build/all//usr/
+COPY --from=mp3gain_build-stage /build/mp3gain/usr/ /build/all//usr/
+COPY --from=pip-stage /usr/lib/python3.6/site-packages /build/all/usr/lib/python3.6/site-packages
+
+# install strip packages
+RUN \
+ apk add --no-cache \
+	bash \
+	binutils
+
+# set shell
+SHELL ["/bin/bash", "-o", "pipefail", "-c"]
+
+# strip packages
+RUN \
+	set -ex && \
+ for dirs in usr/bin usr/lib usr/lib/python3.6/site-packages; \
+	do \
+		find /build/all/"${dirs}" -type f | \
+		while read -r files ; do strip "${files}" || true \
+		; done \
+	; done
+
+# remove unneeded files
+RUN \
+	set -ex && \
+ for cleanfiles in *.la *.pyc *.pyo; \
+	do \
+		find /build/all/ -iname "${cleanfiles}" -exec rm -vf '{}' + \
+	; done
+
+FROM lsiobase/alpine:arm64v8-${ALPINE_VER}
+
+############## runtime stage ##############
 
 # set version label
 ARG BUILD_DATE
@@ -10,89 +202,37 @@ ARG BEETS_VERSION
 LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
 LABEL maintainer="sparklyballs"
 
+# copy artifacts strip stage and apply bandaid
+COPY --from=strip-stage /build/all/usr/  /usr/
+COPY bandaid/aarch64/ /usr/lib/
+
+# install runtime packages
 RUN \
- echo "**** install build packages ****" && \
- apk add --no-cache --virtual=build-dependencies --upgrade \
-	cmake \
-	ffmpeg-dev \
-	fftw-dev \
-	g++ \
-	gcc \
-	git \
-	jpeg-dev \
-	libpng-dev \
-	make \
-	mpg123-dev \
-	openjpeg-dev \
-	python3-dev && \
- echo "**** install runtime packages ****" && \
- apk add --no-cache --upgrade \
+ apk add --no-cache \
 	curl \
-	expat \
 	ffmpeg \
-	ffmpeg-libs \
 	fftw \
-	gdbm \
-	gst-plugins-good \
-	gstreamer \
-	jpeg \
-	jq \
-	lame \
-	libffi \
-	libpng \
 	mpg123 \
 	nano \
-	openjpeg \
-	py3-gobject3 \
+	jq \
+	lame \
+	nano \
+	py3-beautifulsoup4 \
+	py3-flask \
+	py3-jellyfish \
+	py3-munkres \
+	py3-musicbrainzngs \
+	py3-pillow \
 	py3-pip \
 	py3-pylast \
+	py3-requests \
+	py3-setuptools \
+	py3-six \
+	py-enum34 \
 	python3 \
 	sqlite-libs \
 	tar \
-	wget && \
- echo "**** compile mp3gain ****" && \
- mkdir -p \
-	/tmp/mp3gain-src && \
- curl -o \
- /tmp/mp3gain-src/mp3gain.zip -L \
-	https://sourceforge.net/projects/mp3gain/files/mp3gain/1.6.1/mp3gain-1_6_1-src.zip && \
- cd /tmp/mp3gain-src && \
- unzip -qq /tmp/mp3gain-src/mp3gain.zip && \
- sed -i "s#/usr/local/bin#/usr/bin#g" /tmp/mp3gain-src/Makefile && \
- make && \
- make install && \
- echo "**** compile chromaprint ****" && \
- git clone https://bitbucket.org/acoustid/chromaprint.git \
-	/tmp/chromaprint && \
- cd /tmp/chromaprint && \
- cmake \
-	-DBUILD_TOOLS=ON \
-	-DCMAKE_BUILD_TYPE=Release \
-	-DCMAKE_INSTALL_PREFIX:PATH=/usr && \
- make && \
- make install && \
- echo "**** install pip packages ****" && \
- if [ -z ${BEETS_VERSION+x} ]; then \
-	BEETS_VERSION=$(curl -sL  https://pypi.python.org/pypi/beets/json \
-	|jq -r '. | .info.version'); \
- fi && \
- pip3 install --no-cache-dir -U \
-	beautifulsoup4 \
-	beets==${BEETS_VERSION} \
-	beets-copyartifacts \
-	discogs-client \
-	flask \
-	pillow \
-	pip \
-	pyacoustid \
-	requests \
-	unidecode && \
- echo "**** cleanup ****" && \
- apk del --purge \
-	build-dependencies && \
- rm -rf \
-	/root/.cache \
-	/tmp/*
+	wget
 
 # environment settings
 ENV BEETSDIR="/config" \

Dockerfile.armhf

@@ -1,7 +1,195 @@
-FROM lsiobase/alpine.armhf:3.8
+ARG ALPINE_VER="3.9"
+FROM lsiobase/alpine:arm32v7-${ALPINE_VER} as fetch-stage
 
-# Add qemu to build on x86_64 systems
-COPY qemu-arm-static /usr/bin
+############## fetch stage ##############
+
+# package versions
+ARG MP3GAIN_VER="1.6.2"
+
+# install fetch packages
+RUN \
+ apk add --no-cache \
+	bash \
+	curl \
+	git \
+	jq \
+	unzip
+
+# set shell
+SHELL ["/bin/bash", "-o", "pipefail", "-c"]
+
+# fetch source code
+RUN \
+ set -ex && \
+ mkdir -p \
+	/tmp/beets-src \
+	/tmp/mp3gain-src && \
+ if [ -z ${BEETS_VERSION+x} ] ; then \
+ BEETS_RAW_COMMIT=$(curl -sX GET "https://api.github.com/repos/beetbox/beets/commits/master" \
+	| jq -r .sha) && \
+ BEETS_VERSION="${BEETS_RAW_COMMIT:0:7}"; \
+ fi && \
+ curl -o \
+ /tmp/beets.tar.gz -L \
+	"https://github.com/sampsyo/beets/archive/${BEETS_VERSION}.tar.gz" && \
+ curl -o \
+ /tmp/mp3gain.zip -L \
+	"https://sourceforge.net/projects/mp3gain/files/mp3gain/${MP3GAIN_VER}/mp3gain-${MP3GAIN_VER//./_}-src.zip" && \
+ tar xf \
+ /tmp/beets.tar.gz -C \
+	/tmp/beets-src --strip-components=1 && \
+ unzip -q /tmp/mp3gain.zip -d /tmp/mp3gain-src && \
+ git clone https://bitbucket.org/acoustid/chromaprint.git /tmp/chromaprint-src && \
+ git clone https://github.com/sbarakat/beets-copyartifacts.git /tmp/copyartifacts-src
+
+FROM lsiobase/alpine:arm32v7-${ALPINE_VER} as beets_build-stage
+
+############## beets build stage ##############
+
+# copy artifacts from fetch stage
+COPY --from=fetch-stage /tmp/beets-src /tmp/beets-src
+COPY --from=fetch-stage /tmp/copyartifacts-src /tmp/copyartifacts-src
+
+# set workdir for beets install
+WORKDIR /tmp/beets-src
+
+# install build packages
+RUN \
+ apk add --no-cache \
+	py3-setuptools \
+	python3-dev
+
+# build beets package
+RUN \
+ set -ex && \
+ python3 setup.py build && \
+ python3 setup.py install --prefix=/usr --root=/build/beets
+
+# set workdir for copyartifacts install
+WORKDIR /tmp/copyartifacts-src
+
+# build copyartifacts package
+RUN \
+ set -ex && \
+ python3 setup.py install --prefix=/usr --root=/build/beets
+
+FROM alpine:${ALPINE_VER} as mp3gain_build-stage
+
+############## mp3gain build stage ##############
+
+# copy artifacts from fetch stage
+COPY --from=fetch-stage /tmp/mp3gain-src /tmp/mp3gain-src
+
+# set workdir
+WORKDIR /tmp/mp3gain-src
+
+# install build packages
+RUN \
+ apk add --no-cache \
+	g++ \
+	make \
+	mpg123-dev
+
+# build package
+RUN \
+ set -ex && \
+ mkdir -p \
+	/build/mp3gain/usr/bin && \
+ sed -i "s#/usr/local/bin#/build/mp3gain/usr/bin#g" Makefile && \
+ make && \
+ make install
+
+FROM lsiobase/alpine:arm32v7-${ALPINE_VER} as chromaprint_build-stage
+
+############## chromaprint build stage ##############
+
+# copy artifacts from fetch stage
+COPY --from=fetch-stage /tmp/chromaprint-src /tmp/chromaprint-src
+
+# set workdir
+WORKDIR /tmp/chromaprint-src
+
+# install build packages
+RUN \
+ apk add --no-cache \
+	cmake \
+	ffmpeg-dev \
+	fftw-dev \
+	g++ \
+	make
+
+# build package
+RUN \
+ set -ex && \
+ cmake \
+	-DBUILD_TOOLS=ON \
+	-DCMAKE_BUILD_TYPE=Release \
+	-DCMAKE_INSTALL_PREFIX:PATH=/usr && \
+ make && \
+ make DESTDIR=/build/chromaprint install
+
+FROM lsiobase/alpine:arm32v7-${ALPINE_VER} as pip-stage
+
+############## pip packages install stage ##############
+
+# install build packages
+RUN \
+ apk add --no-cache \
+	g++ \
+	make \
+	py3-pip \
+	python3-dev
+
+# install pip packages
+RUN \
+ set -ex && \
+ pip3 install --no-cache-dir -U \
+	discogs-client \
+	mutagen \
+	pyacoustid \
+	pyyaml \
+	unidecode
+
+FROM lsiobase/alpine:arm32v7-${ALPINE_VER} as strip-stage
+
+############## strip packages stage ##############
+
+# copy artifacts build stages
+COPY --from=beets_build-stage /build/beets/usr/ /build/all//usr/
+COPY --from=chromaprint_build-stage /build/chromaprint/usr/ /build/all//usr/
+COPY --from=mp3gain_build-stage /build/mp3gain/usr/ /build/all//usr/
+COPY --from=pip-stage /usr/lib/python3.6/site-packages /build/all/usr/lib/python3.6/site-packages
+
+# install strip packages
+RUN \
+ apk add --no-cache \
+	bash \
+	binutils
+
+# set shell
+SHELL ["/bin/bash", "-o", "pipefail", "-c"]
+
+# strip packages
+RUN \
+	set -ex && \
+ for dirs in usr/bin usr/lib usr/lib/python3.6/site-packages; \
+	do \
+		find /build/all/"${dirs}" -type f | \
+		while read -r files ; do strip "${files}" || true \
+		; done \
+	; done
+
+# remove unneeded files
+RUN \	
+	set -ex && \
+ for cleanfiles in *.la *.pyc *.pyo; \
+	do \
+		find /build/all/ -iname "${cleanfiles}" -exec rm -vf '{}' + \
+	; done
+
+FROM lsiobase/alpine:arm32v7-${ALPINE_VER}
+
+############## runtime stage ##############
 
 # set version label
 ARG BUILD_DATE
@@ -10,89 +198,36 @@ ARG BEETS_VERSION
 LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
 LABEL maintainer="sparklyballs"
 
+# copy artifacts strip stage
+COPY --from=strip-stage /build/all/usr/  /usr/
+
+# install runtime packages
 RUN \
- echo "**** install build packages ****" && \
- apk add --no-cache --virtual=build-dependencies --upgrade \
-	cmake \
-	ffmpeg-dev \
-	fftw-dev \
-	g++ \
-	gcc \
-	git \
-	jpeg-dev \
-	libpng-dev \
-	make \
-	mpg123-dev \
-	openjpeg-dev \
-	python3-dev && \
- echo "**** install runtime packages ****" && \
- apk add --no-cache --upgrade \
+ apk add --no-cache \
 	curl \
-	expat \
 	ffmpeg \
-	ffmpeg-libs \
 	fftw \
-	gdbm \
-	gst-plugins-good \
-	gstreamer \
-	jpeg \
-	jq \
-	lame \
-	libffi \
-	libpng \
 	mpg123 \
 	nano \
-	openjpeg \
-	py3-gobject3 \
+	jq \
+	lame \
+	nano \
+	py3-beautifulsoup4 \
+	py3-flask \
+	py3-jellyfish \
+	py3-munkres \
+	py3-musicbrainzngs \
+	py3-pillow \
 	py3-pip \
 	py3-pylast \
+	py3-requests \
+	py3-setuptools \
+	py3-six \
+	py-enum34 \
 	python3 \
 	sqlite-libs \
 	tar \
-	wget && \
- echo "**** compile mp3gain ****" && \
- mkdir -p \
-	/tmp/mp3gain-src && \
- curl -o \
- /tmp/mp3gain-src/mp3gain.zip -L \
-	https://sourceforge.net/projects/mp3gain/files/mp3gain/1.6.1/mp3gain-1_6_1-src.zip && \
- cd /tmp/mp3gain-src && \
- unzip -qq /tmp/mp3gain-src/mp3gain.zip && \
- sed -i "s#/usr/local/bin#/usr/bin#g" /tmp/mp3gain-src/Makefile && \
- make && \
- make install && \
- echo "**** compile chromaprint ****" && \
- git clone https://bitbucket.org/acoustid/chromaprint.git \
-	/tmp/chromaprint && \
- cd /tmp/chromaprint && \
- cmake \
-	-DBUILD_TOOLS=ON \
-	-DCMAKE_BUILD_TYPE=Release \
-	-DCMAKE_INSTALL_PREFIX:PATH=/usr && \
- make && \
- make install && \
- echo "**** install pip packages ****" && \
- if [ -z ${BEETS_VERSION+x} ]; then \
-	BEETS_VERSION=$(curl -sL  https://pypi.python.org/pypi/beets/json \
-	|jq -r '. | .info.version'); \
- fi && \
- pip3 install --no-cache-dir -U \
-	beautifulsoup4 \
-	beets==${BEETS_VERSION} \
-	beets-copyartifacts \
-	discogs-client \
-	flask \
-	pillow \
-	pip \
-	pyacoustid \
-	requests \
-	unidecode && \
- echo "**** cleanup ****" && \
- apk del --purge \
-	build-dependencies && \
- rm -rf \
-	/root/.cache \
-	/tmp/*
+	wget
 
 # environment settings
 ENV BEETSDIR="/config" \

Jenkinsfile

@@ -11,7 +11,9 @@ pipeline {
     BUILDS_DISCORD=credentials('build_webhook_url')
     GITHUB_TOKEN=credentials('498b4638-2d02-4ce5-832d-8a57d01d97ab')
     BUILD_VERSION_ARG = 'BEETS_VERSION'
-    EXT_PIP='beets'
+    EXT_GIT_BRANCH = 'master'
+    EXT_USER = 'beetbox'
+    EXT_REPO = 'beets'
     LS_USER = 'linuxserver'
     LS_REPO = 'docker-beets'
     CONTAINER_NAME = 'beets'
@@ -36,7 +38,7 @@ pipeline {
         script{
           env.EXIT_STATUS = ''
           env.LS_RELEASE = sh(
-            script: '''curl -s https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases/latest | jq -r '. | .tag_name' ''',
+            script: '''docker run --rm alexeiled/skopeo sh -c 'skopeo inspect docker://docker.io/'${DOCKERHUB_IMAGE}':nightly 2>/dev/null' | jq -r '.Labels.build_version' | awk '{print $3}' | grep '\\-ls' || : ''',
             returnStdout: true).trim()
           env.LS_RELEASE_NOTES = sh(
             script: '''cat readme-vars.yml | awk -F \\" '/date: "[0-9][0-9].[0-9][0-9].[0-9][0-9]:/ {print $4;exit;}' | sed -E ':a;N;$!ba;s/\\r{0,1}\\n/\\\\n/g' ''',
@@ -50,6 +52,14 @@ pipeline {
           env.CODE_URL = 'https://github.com/' + env.LS_USER + '/' + env.LS_REPO + '/commit/' + env.GIT_COMMIT
           env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.DOCKERHUB_IMAGE + '/tags/'
           env.PULL_REQUEST = env.CHANGE_ID
+          env.LICENSE_TAG = sh(
+            script: '''#!/bin/bash
+                       if [ -e LICENSE ] ; then
+                         cat LICENSE | md5sum | cut -c1-8
+                       else
+                         echo none
+                       fi''',
+            returnStdout: true).trim()
         }
         script{
           env.LS_RELEASE_NUMBER = sh(
@@ -92,17 +102,25 @@ pipeline {
     /* ########################
        External Release Tagging
        ######################## */
-    // If this is a pip release set the external tag to the pip version
-    stage("Set ENV pip_version"){
-      steps{
-        script{
-          env.EXT_RELEASE = sh(
-            script: '''curl -sL  https://pypi.python.org/pypi/${EXT_PIP}/json |jq -r '. | .info.version' ''',
-            returnStdout: true).trim()
-          env.RELEASE_LINK = 'https://pypi.python.org/pypi/' + env.EXT_PIP
-        }
-      }
-    }    // Sanitize the release tag and strip illegal docker or github characters
+    // If this is a github commit trigger determine the current commit at head
+    stage("Set ENV github_commit"){
+     steps{
+       script{
+         env.EXT_RELEASE = sh(
+           script: '''curl -s https://api.github.com/repos/${EXT_USER}/${EXT_REPO}/commits/${EXT_GIT_BRANCH} | jq -r '. | .sha' | cut -c1-8 ''',
+           returnStdout: true).trim()
+       }
+     }
+    }
+    // If this is a github commit trigger Set the external release link
+    stage("Set ENV commit_link"){
+     steps{
+       script{
+         env.RELEASE_LINK = 'https://github.com/' + env.EXT_USER + '/' + env.EXT_REPO + '/commit/' + env.EXT_RELEASE
+       }
+     }
+    }
+    // Sanitize the release tag and strip illegal docker or github characters
     stage("Sanitize tag"){
       steps{
         script{
@@ -112,17 +130,17 @@ pipeline {
         }
       }
     }
-    // If this is a master build use live docker endpoints
+    // If this is a nightly build use live docker endpoints
     stage("Set ENV live build"){
       when {
-        branch "master"
+        branch "nightly"
         environment name: 'CHANGE_ID', value: ''
       }
       steps {
         script{
           env.IMAGE = env.DOCKERHUB_IMAGE
           if (env.MULTIARCH == 'true') {
-            env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm32v6-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
+            env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm32v7-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
           } else {
             env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
           }
@@ -133,14 +151,14 @@ pipeline {
     // If this is a dev build use dev docker endpoints
     stage("Set ENV dev build"){
       when {
-        not {branch "master"}
+        not {branch "nightly"}
         environment name: 'CHANGE_ID', value: ''
       }
       steps {
         script{
           env.IMAGE = env.DEV_DOCKERHUB_IMAGE
           if (env.MULTIARCH == 'true') {
-            env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm32v6-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
+            env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm32v7-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
           } else {
             env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
           }
@@ -158,7 +176,7 @@ pipeline {
         script{
           env.IMAGE = env.PR_DOCKERHUB_IMAGE
           if (env.MULTIARCH == 'true') {
-            env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + '|arm32v6-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST
+            env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + '|arm32v7-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST
           } else {
             env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST
           }
@@ -168,10 +186,39 @@ pipeline {
         }
       }
     }
+    // Run ShellCheck
+    stage('ShellCheck') {
+      when {
+        environment name: 'CI', value: 'true'
+      }
+      steps {
+        withCredentials([
+          string(credentialsId: 'spaces-key', variable: 'DO_KEY'),
+          string(credentialsId: 'spaces-secret', variable: 'DO_SECRET')
+        ]) {
+          script{
+            env.SHELLCHECK_URL = 'https://lsio-ci.ams3.digitaloceanspaces.com/' + env.IMAGE + '/' + env.META_TAG + '/shellcheck-result.xml'
+          }
+          sh '''curl -sL https://raw.githubusercontent.com/linuxserver/docker-shellcheck/master/checkrun.sh | /bin/bash'''
+          sh '''#! /bin/bash
+                set -e
+                docker pull lsiodev/spaces-file-upload:latest
+                docker run --rm \
+                -e DESTINATION=\"${IMAGE}/${META_TAG}/shellcheck-result.xml\" \
+                -e FILE_NAME="shellcheck-result.xml" \
+                -e MIMETYPE="text/xml" \
+                -v ${WORKSPACE}:/mnt \
+                -e SECRET_KEY=\"${DO_SECRET}\" \
+                -e ACCESS_KEY=\"${DO_KEY}\" \
+                -t lsiodev/spaces-file-upload:latest \
+                python /upload.py'''
+        }
+      }
+    }
     // Use helper containers to render templated files
     stage('Update-Templates') {
       when {
-        branch "master"
+        branch "nightly"
         environment name: 'CHANGE_ID', value: ''
         expression {
           env.CONTAINER_NAME != null
@@ -182,17 +229,20 @@ pipeline {
               set -e
               TEMPDIR=$(mktemp -d)
               docker pull linuxserver/jenkins-builder:latest
-              docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=master -v ${TEMPDIR}:/ansible/jenkins linuxserver/jenkins-builder:latest 
+              docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=nightly -v ${TEMPDIR}:/ansible/jenkins linuxserver/jenkins-builder:latest 
               docker pull linuxserver/doc-builder:latest
-              docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=master -v ${TEMPDIR}:/ansible/readme linuxserver/doc-builder:latest
-              if [ "$(md5sum ${TEMPDIR}/${LS_REPO}/Jenkinsfile | awk '{ print $1 }')" != "$(md5sum Jenkinsfile | awk '{ print $1 }')" ] || [ "$(md5sum ${TEMPDIR}/${CONTAINER_NAME}/README.md | awk '{ print $1 }')" != "$(md5sum README.md | awk '{ print $1 }')" ]; then
+              docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=nightly -v ${TEMPDIR}:/ansible/readme linuxserver/doc-builder:latest
+              if [ "$(md5sum ${TEMPDIR}/${LS_REPO}/Jenkinsfile | awk '{ print $1 }')" != "$(md5sum Jenkinsfile | awk '{ print $1 }')" ] || \
+                 [ "$(md5sum ${TEMPDIR}/${CONTAINER_NAME}/README.md | awk '{ print $1 }')" != "$(md5sum README.md | awk '{ print $1 }')" ] || \
+                 [ "$(cat ${TEMPDIR}/${LS_REPO}/LICENSE | md5sum | cut -c1-8)" != "${LICENSE_TAG}" ]; then
                 mkdir -p ${TEMPDIR}/repo
                 git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO}
-                git --git-dir ${TEMPDIR}/repo/${LS_REPO}/.git checkout -f master
+                git --git-dir ${TEMPDIR}/repo/${LS_REPO}/.git checkout -f nightly
                 cp ${TEMPDIR}/${CONTAINER_NAME}/README.md ${TEMPDIR}/repo/${LS_REPO}/
                 cp ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile ${TEMPDIR}/repo/${LS_REPO}/
+                cp ${TEMPDIR}/docker-${CONTAINER_NAME}/LICENSE ${TEMPDIR}/repo/${LS_REPO}/
                 cd ${TEMPDIR}/repo/${LS_REPO}/
-                git --git-dir ${TEMPDIR}/repo/${LS_REPO}/.git add Jenkinsfile README.md
+                git --git-dir ${TEMPDIR}/repo/${LS_REPO}/.git add Jenkinsfile README.md LICENSE
                 git --git-dir ${TEMPDIR}/repo/${LS_REPO}/.git commit -m 'Bot Updating Templated Files'
                 git --git-dir ${TEMPDIR}/repo/${LS_REPO}/.git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all
                 echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
@@ -201,7 +251,7 @@ pipeline {
               fi
               mkdir -p ${TEMPDIR}/gitbook
               git clone https://github.com/linuxserver/docker-documentation.git ${TEMPDIR}/gitbook/docker-documentation
-              if [ "${BRANCH_NAME}" = "master" ] && [ ! -f ${TEMPDIR}/gitbook/docker-documentation/images/docker-${CONTAINER_NAME}.md ] || [ "$(md5sum ${TEMPDIR}/gitbook/docker-documentation/images/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/${CONTAINER_NAME}/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')" ]; then
+              if [[ "${BRANCH_NAME}" == "master" ]] && [[ (! -f ${TEMPDIR}/gitbook/docker-documentation/images/docker-${CONTAINER_NAME}.md) || ("$(md5sum ${TEMPDIR}/gitbook/docker-documentation/images/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/${CONTAINER_NAME}/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')") ]]; then
                 cp ${TEMPDIR}/${CONTAINER_NAME}/docker-${CONTAINER_NAME}.md ${TEMPDIR}/gitbook/docker-documentation/images/
                 cd ${TEMPDIR}/gitbook/docker-documentation/
                 git add images/docker-${CONTAINER_NAME}.md
@@ -219,7 +269,7 @@ pipeline {
     // Exit the build if the Templated files were just updated
     stage('Template-exit') {
       when {
-        branch "master"
+        branch "nightly"
         environment name: 'CHANGE_ID', value: ''
         environment name: 'FILES_UPDATED', value: 'true'
         expression {
@@ -242,7 +292,7 @@ pipeline {
         environment name: 'EXIT_STATUS', value: ''
       }
       steps {
-        sh "docker build --no-cache -t ${IMAGE}:${META_TAG} \
+        sh "docker build --no-cache --pull -t ${IMAGE}:${META_TAG} \
         --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
       }
     }
@@ -255,7 +305,7 @@ pipeline {
       parallel {
         stage('Build X86') {
           steps {
-            sh "docker build --no-cache -t ${IMAGE}:amd64-${META_TAG} \
+            sh "docker build --no-cache --pull -t ${IMAGE}:amd64-${META_TAG} \
             --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
           }
         }
@@ -276,15 +326,13 @@ pipeline {
               sh '''#! /bin/bash
                  echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin
                  '''
-              sh "curl https://lsio-ci.ams3.digitaloceanspaces.com/qemu-arm-static -o qemu-arm-static"
-              sh "chmod +x qemu-*"
-              sh "docker build --no-cache -f Dockerfile.armhf -t ${IMAGE}:arm32v6-${META_TAG} \
+              sh "docker build --no-cache --pull -f Dockerfile.armhf -t ${IMAGE}:arm32v7-${META_TAG} \
                            --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
-              sh "docker tag ${IMAGE}:arm32v6-${META_TAG} lsiodev/buildcache:arm32v6-${COMMIT_SHA}-${BUILD_NUMBER}"
-              sh "docker push lsiodev/buildcache:arm32v6-${COMMIT_SHA}-${BUILD_NUMBER}"
+              sh "docker tag ${IMAGE}:arm32v7-${META_TAG} lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}"
+              sh "docker push lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}"
               sh '''docker rmi \
-                    ${IMAGE}:arm32v6-${META_TAG} \
-                    lsiodev/buildcache:arm32v6-${COMMIT_SHA}-${BUILD_NUMBER} '''
+                    ${IMAGE}:arm32v7-${META_TAG} \
+                    lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} || :'''
             }
           }
         }
@@ -305,15 +353,13 @@ pipeline {
               sh '''#! /bin/bash
                  echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin
                  '''
-              sh "curl https://lsio-ci.ams3.digitaloceanspaces.com/qemu-aarch64-static -o qemu-aarch64-static"
-              sh "chmod +x qemu-*"
-              sh "docker build --no-cache -f Dockerfile.aarch64 -t ${IMAGE}:arm64v8-${META_TAG} \
+              sh "docker build --no-cache --pull -f Dockerfile.aarch64 -t ${IMAGE}:arm64v8-${META_TAG} \
                            --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
               sh "docker tag ${IMAGE}:arm64v8-${META_TAG} lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}"
               sh "docker push lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}"
               sh '''docker rmi \
                     ${IMAGE}:arm64v8-${META_TAG} \
-                    lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} '''
+                    lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || :'''
             }
           }
         }
@@ -322,7 +368,7 @@ pipeline {
     // Take the image we just built and dump package versions for comparison
     stage('Update-packages') {
       when {
-        branch "master"
+        branch "nightly"
         environment name: 'CHANGE_ID', value: ''
         environment name: 'EXIT_STATUS', value: ''
       }
@@ -337,20 +383,20 @@ pipeline {
               fi
               if [ "${DIST_IMAGE}" == "alpine" ]; then
                 docker run --rm --entrypoint '/bin/sh' -v ${TEMPDIR}:/tmp ${LOCAL_CONTAINER} -c '\
-                  apk info > packages && \
-                  apk info -v > versions && \
-                  paste -d " " packages versions > /tmp/package_versions.txt && \
+                  apk info -v > /tmp/package_versions.txt && \
+                  sort -o /tmp/package_versions.txt  /tmp/package_versions.txt && \
                   chmod 777 /tmp/package_versions.txt'
               elif [ "${DIST_IMAGE}" == "ubuntu" ]; then
                 docker run --rm --entrypoint '/bin/sh' -v ${TEMPDIR}:/tmp ${LOCAL_CONTAINER} -c '\
-                  apt list -qq --installed | cut -d" " -f1-2 > /tmp/package_versions.txt && \
+                  apt list -qq --installed | sed "s#/.*now ##g" | cut -d" " -f1 > /tmp/package_versions.txt && \
+                  sort -o /tmp/package_versions.txt  /tmp/package_versions.txt && \
                   chmod 777 /tmp/package_versions.txt'
               fi
               NEW_PACKAGE_TAG=$(md5sum ${TEMPDIR}/package_versions.txt | cut -c1-8 )
               echo "Package tag sha from current packages in buit container is ${NEW_PACKAGE_TAG} comparing to old ${PACKAGE_TAG} from github"
               if [ "${NEW_PACKAGE_TAG}" != "${PACKAGE_TAG}" ]; then
                 git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/${LS_REPO}
-                git --git-dir ${TEMPDIR}/${LS_REPO}/.git checkout -f master
+                git --git-dir ${TEMPDIR}/${LS_REPO}/.git checkout -f nightly
                 cp ${TEMPDIR}/package_versions.txt ${TEMPDIR}/${LS_REPO}/
                 cd ${TEMPDIR}/${LS_REPO}/
                 wait
@@ -374,7 +420,7 @@ pipeline {
     // Exit the build if the package file was just updated
     stage('PACKAGE-exit') {
       when {
-        branch "master"
+        branch "nightly"
         environment name: 'CHANGE_ID', value: ''
         environment name: 'PACKAGE_UPDATED', value: 'true'
         environment name: 'EXIT_STATUS', value: ''
@@ -388,7 +434,7 @@ pipeline {
     // Exit the build if this is just a package check and there are no changes to push
     stage('PACKAGECHECK-exit') {
       when {
-        branch "master"
+        branch "nightly"
         environment name: 'CHANGE_ID', value: ''
         environment name: 'PACKAGE_UPDATED', value: 'false'
         environment name: 'EXIT_STATUS', value: ''
@@ -423,9 +469,9 @@ pipeline {
                 set -e
                 docker pull lsiodev/ci:latest
                 if [ "${MULTIARCH}" == "true" ]; then
-                  docker pull lsiodev/buildcache:arm32v6-${COMMIT_SHA}-${BUILD_NUMBER}
+                  docker pull lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}
                   docker pull lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}
-                  docker tag lsiodev/buildcache:arm32v6-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm32v6-${META_TAG}
+                  docker tag lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm32v7-${META_TAG}
                   docker tag lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG}
                 fi
                 docker run --rm \
@@ -472,12 +518,12 @@ pipeline {
           sh '''#! /bin/bash
              echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin
              '''
-          sh "docker tag ${IMAGE}:${META_TAG} ${IMAGE}:latest"
-          sh "docker push ${IMAGE}:latest"
+          sh "docker tag ${IMAGE}:${META_TAG} ${IMAGE}:nightly"
+          sh "docker push ${IMAGE}:nightly"
           sh "docker push ${IMAGE}:${META_TAG}"
           sh '''docker rmi \
                 ${IMAGE}:${META_TAG} \
-                ${IMAGE}:latest '''
+                ${IMAGE}:nightly || :'''
                 
         }
       }
@@ -502,68 +548,68 @@ pipeline {
              '''
           sh '''#! /bin/bash
                 if [ "${CI}" == "false" ]; then
-                  docker pull lsiodev/buildcache:arm32v6-${COMMIT_SHA}-${BUILD_NUMBER}
+                  docker pull lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}
                   docker pull lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}
-                  docker tag lsiodev/buildcache:arm32v6-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm32v6-${META_TAG}
+                  docker tag lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm32v7-${META_TAG}
                   docker tag lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG}
                 fi'''
-          sh "docker tag ${IMAGE}:amd64-${META_TAG} ${IMAGE}:amd64-latest"
-          sh "docker tag ${IMAGE}:arm32v6-${META_TAG} ${IMAGE}:arm32v6-latest"
-          sh "docker tag ${IMAGE}:arm64v8-${META_TAG} ${IMAGE}:arm64v8-latest"
+          sh "docker tag ${IMAGE}:amd64-${META_TAG} ${IMAGE}:amd64-nightly"
+          sh "docker tag ${IMAGE}:arm32v7-${META_TAG} ${IMAGE}:arm32v7-nightly"
+          sh "docker tag ${IMAGE}:arm64v8-${META_TAG} ${IMAGE}:arm64v8-nightly"
           sh "docker push ${IMAGE}:amd64-${META_TAG}"
-          sh "docker push ${IMAGE}:arm32v6-${META_TAG}"
+          sh "docker push ${IMAGE}:arm32v7-${META_TAG}"
           sh "docker push ${IMAGE}:arm64v8-${META_TAG}"
-          sh "docker push ${IMAGE}:amd64-latest"
-          sh "docker push ${IMAGE}:arm32v6-latest"
-          sh "docker push ${IMAGE}:arm64v8-latest"
-          sh "docker manifest push --purge ${IMAGE}:latest || :"
-          sh "docker manifest create ${IMAGE}:latest ${IMAGE}:amd64-latest ${IMAGE}:arm32v6-latest ${IMAGE}:arm64v8-latest"
-          sh "docker manifest annotate ${IMAGE}:latest ${IMAGE}:arm32v6-latest --os linux --arch arm"
-          sh "docker manifest annotate ${IMAGE}:latest ${IMAGE}:arm64v8-latest --os linux --arch arm64 --variant v8"
+          sh "docker push ${IMAGE}:amd64-nightly"
+          sh "docker push ${IMAGE}:arm32v7-nightly"
+          sh "docker push ${IMAGE}:arm64v8-nightly"
+          sh "docker manifest push --purge ${IMAGE}:nightly || :"
+          sh "docker manifest create ${IMAGE}:nightly ${IMAGE}:amd64-nightly ${IMAGE}:arm32v7-nightly ${IMAGE}:arm64v8-nightly"
+          sh "docker manifest annotate ${IMAGE}:nightly ${IMAGE}:arm32v7-nightly --os linux --arch arm"
+          sh "docker manifest annotate ${IMAGE}:nightly ${IMAGE}:arm64v8-nightly --os linux --arch arm64 --variant v8"
           sh "docker manifest push --purge ${IMAGE}:${META_TAG} || :"
-          sh "docker manifest create ${IMAGE}:${META_TAG} ${IMAGE}:amd64-${META_TAG} ${IMAGE}:arm32v6-${META_TAG} ${IMAGE}:arm64v8-${META_TAG}"
-          sh "docker manifest annotate ${IMAGE}:${META_TAG} ${IMAGE}:arm32v6-${META_TAG} --os linux --arch arm"
+          sh "docker manifest create ${IMAGE}:${META_TAG} ${IMAGE}:amd64-${META_TAG} ${IMAGE}:arm32v7-${META_TAG} ${IMAGE}:arm64v8-${META_TAG}"
+          sh "docker manifest annotate ${IMAGE}:${META_TAG} ${IMAGE}:arm32v7-${META_TAG} --os linux --arch arm"
           sh "docker manifest annotate ${IMAGE}:${META_TAG} ${IMAGE}:arm64v8-${META_TAG} --os linux --arch arm64 --variant v8"
-          sh "docker manifest push --purge ${IMAGE}:latest"
+          sh "docker manifest push --purge ${IMAGE}:nightly"
           sh "docker manifest push --purge ${IMAGE}:${META_TAG}"
           sh '''docker rmi \
                 ${IMAGE}:amd64-${META_TAG} \
-                ${IMAGE}:amd64-latest \
-                ${IMAGE}:arm32v6-${META_TAG} \
-                ${IMAGE}:arm32v6-latest \
+                ${IMAGE}:amd64-nightly \
+                ${IMAGE}:arm32v7-${META_TAG} \
+                ${IMAGE}:arm32v7-nightly \
                 ${IMAGE}:arm64v8-${META_TAG} \
-                ${IMAGE}:arm64v8-latest \
-                lsiodev/buildcache:arm32v6-${COMMIT_SHA}-${BUILD_NUMBER} \
-                lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} '''
+                ${IMAGE}:arm64v8-nightly \
+                lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} \
+                lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || :'''
         }
       }
     }
     // If this is a public release tag it in the LS Github
     stage('Github-Tag-Push-Release') {
       when {
-        branch "master"
+        branch "nightly"
         expression {
-          env.LS_RELEASE != env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-ls' + env.LS_TAG_NUMBER
+          env.LS_RELEASE != env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
         }
         environment name: 'CHANGE_ID', value: ''
         environment name: 'EXIT_STATUS', value: ''
       }
       steps {
-        echo "Pushing New tag for current commit ${EXT_RELEASE_CLEAN}-pkg-${PACKAGE_TAG}-ls${LS_TAG_NUMBER}"
+        echo "Pushing New tag for current commit ${EXT_RELEASE_CLEAN}-ls${LS_TAG_NUMBER}"
         sh '''curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/git/tags \
-        -d '{"tag":"'${EXT_RELEASE_CLEAN}'-pkg-'${PACKAGE_TAG}'-ls'${LS_TAG_NUMBER}'",\
+        -d '{"tag":"'${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}'",\
              "object": "'${COMMIT_SHA}'",\
-             "message": "Tagging Release '${EXT_RELEASE_CLEAN}'-pkg-'${PACKAGE_TAG}'-ls'${LS_TAG_NUMBER}' to master",\
+             "message": "Tagging Release '${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}' to nightly",\
              "type": "commit",\
              "tagger": {"name": "LinuxServer Jenkins","email": "jenkins@linuxserver.io","date": "'${GITHUB_DATE}'"}}' '''
         echo "Pushing New release for Tag"
         sh '''#! /bin/bash
-              echo "Updating PIP version of ${EXT_PIP} to ${EXT_RELEASE_CLEAN}" > releasebody.json
-              echo '{"tag_name":"'${EXT_RELEASE_CLEAN}'-pkg-'${PACKAGE_TAG}'-ls'${LS_TAG_NUMBER}'",\
-                     "target_commitish": "master",\
-                     "name": "'${EXT_RELEASE_CLEAN}'-pkg-'${PACKAGE_TAG}'-ls'${LS_TAG_NUMBER}'",\
-                     "body": "**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n**PIP Changes:**\\n\\n' > start
-              printf '","draft": false,"prerelease": false}' >> releasebody.json
+              curl -s https://api.github.com/repos/${EXT_USER}/${EXT_REPO}/commits/${EXT_GIT_BRANCH} | jq '. | .commit.message' | sed 's:^.\\(.*\\).$:\\1:' > releasebody.json
+              echo '{"tag_name":"'${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}'",\
+                     "target_commitish": "nightly",\
+                     "name": "'${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}'",\
+                     "body": "**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n**'${EXT_REPO}' Changes:**\\n\\n' > start
+              printf '","draft": false,"prerelease": true}' >> releasebody.json
               paste -d'\\0' start releasebody.json > releasebody.json.done
               curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases -d @releasebody.json.done'''
       }
@@ -604,7 +650,7 @@ pipeline {
       }
       steps {
         sh '''curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/issues/${PULL_REQUEST}/comments \
-        -d '{"body": "I am a bot, here are the test results for this PR '${CI_URL}'"}' '''
+        -d '{"body": "I am a bot, here are the test results for this PR: \\n'${CI_URL}' \\n'${SHELLCHECK_URL}'"}' '''
       }
     }
   }
@@ -619,12 +665,12 @@ pipeline {
         }
         else if (currentBuild.currentResult == "SUCCESS"){
           sh ''' curl -X POST --data '{"avatar_url": "https://wiki.jenkins-ci.org/download/attachments/2916393/headshot.png","embeds": [{"color": 1681177,\
-                 "description": "**Build:**  '${BUILD_NUMBER}'\\n**CI Results:**  '${CI_URL}'\\n**Status:**  Success\\n**Job:** '${RUN_DISPLAY_URL}'\\n**Change:** '${CODE_URL}'\\n**External Release:**: '${RELEASE_LINK}'\\n**DockerHub:** '${DOCKERHUB_LINK}'\\n"}],\
+                 "description": "**Build:**  '${BUILD_NUMBER}'\\n**CI Results:**  '${CI_URL}'\\n**ShellCheck Results:**  '${SHELLCHECK_URL}'\\n**Status:**  Success\\n**Job:** '${RUN_DISPLAY_URL}'\\n**Change:** '${CODE_URL}'\\n**External Release:**: '${RELEASE_LINK}'\\n**DockerHub:** '${DOCKERHUB_LINK}'\\n"}],\
                  "username": "Jenkins"}' ${BUILDS_DISCORD} '''
         }
         else {
           sh ''' curl -X POST --data '{"avatar_url": "https://wiki.jenkins-ci.org/download/attachments/2916393/headshot.png","embeds": [{"color": 16711680,\
-                 "description": "**Build:**  '${BUILD_NUMBER}'\\n**CI Results:**  '${CI_URL}'\\n**Status:**  failure\\n**Job:** '${RUN_DISPLAY_URL}'\\n**Change:** '${CODE_URL}'\\n**External Release:**: '${RELEASE_LINK}'\\n**DockerHub:** '${DOCKERHUB_LINK}'\\n"}],\
+                 "description": "**Build:**  '${BUILD_NUMBER}'\\n**CI Results:**  '${CI_URL}'\\n**ShellCheck Results:**  '${SHELLCHECK_URL}'\\n**Status:**  failure\\n**Job:** '${RUN_DISPLAY_URL}'\\n**Change:** '${CODE_URL}'\\n**External Release:**: '${RELEASE_LINK}'\\n**DockerHub:** '${DOCKERHUB_LINK}'\\n"}],\
                  "username": "Jenkins"}' ${BUILDS_DISCORD} '''
         }
       }

LICENSE

@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<https://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<https://www.gnu.org/licenses/why-not-lgpl.html>.

README.md

@@ -12,7 +12,6 @@ Find us at:
 * [Discord](https://discord.gg/YWrKVTn) - realtime support / chat with the community and the team.
 * [IRC](https://irc.linuxserver.io) - on freenode at `#linuxserver.io`. Our primary support channel is Discord.
 * [Blog](https://blog.linuxserver.io) - all the things you can do with our containers including How-To guides, opinions and much more!
-* [Podcast](https://anchor.fm/linuxserverio) - on hiatus. Coming back soon (late 2018).
 
 # [linuxserver/beets](https://github.com/linuxserver/docker-beets)
 [![](https://img.shields.io/discord/354974912613449730.svg?logo=discord&label=LSIO%20Discord&style=flat-square)](https://discord.gg/YWrKVTn)
@@ -39,7 +38,7 @@ The architectures supported by this image are:
 | :----: | --- |
 | x86-64 | amd64-latest |
 | arm64 | arm64v8-latest |
-| armhf | arm32v6-latest |
+| armhf | arm32v7-latest |
 
 
 ## Usage
@@ -141,15 +140,6 @@ Below are the instructions for updating containers:
 * Start the new container: `docker start beets`
 * You can also remove the old dangling images: `docker image prune`
 
-### Via Taisun auto-updater (especially useful if you don't remember the original parameters)
-* Pull the latest image at its tag and replace it with the same env variables in one shot:
-  ```
-  docker run --rm \
-  -v /var/run/docker.sock:/var/run/docker.sock taisun/updater \
-  --oneshot beets
-  ```
-* You can also remove the old dangling images: `docker image prune`
-
 ### Via Docker Compose
 * Update all images: `docker-compose pull`
   * or update a single image: `docker-compose pull beets`
@@ -157,8 +147,38 @@ Below are the instructions for updating containers:
   * or update a single container: `docker-compose up -d beets`
 * You can also remove the old dangling images: `docker image prune`
 
+### Via Watchtower auto-updater (especially useful if you don't remember the original parameters)
+* Pull the latest image at its tag and replace it with the same env variables in one run:
+  ```
+  docker run --rm \
+  -v /var/run/docker.sock:/var/run/docker.sock \
+  containrrr/watchtower \
+  --run-once beets
+  ```
+* You can also remove the old dangling images: `docker image prune`
+
+## Building locally
+
+If you want to make local modifications to these images for development purposes or just to customize the logic: 
+```
+git clone https://github.com/linuxserver/docker-beets.git
+cd docker-beets
+docker build \
+  --no-cache \
+  --pull \
+  -t linuxserver/beets:latest .
+```
+
+The ARM variants can be built on x86_64 hardware using `multiarch/qemu-user-static`
+```
+docker run --rm --privileged multiarch/qemu-user-static:register --reset
+```
+
+Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64`.
+
 ## Versions
 
+* **23.03.19:** - Switching to new Base images, shift to arm32v7 tag.
 * **01.03.19:** - Switch to python3.
 * **07.02.19:** - Add fftw-dev build dependency for chromaprint.
 * **28.01.19:** - Add pipeline logic and multi arch.

jenkins-vars.yml

@@ -2,13 +2,15 @@
 
 # jenkins variables
 project_name: docker-beets
-external_type: pip_version
-release_type: stable
-release_tag: latest
-ls_branch: master
+external_type: github_commit
+release_type: prerelease
+release_tag: nightly
+ls_branch: nightly
 repo_vars:
   - BUILD_VERSION_ARG = 'BEETS_VERSION'
-  - EXT_PIP='beets'
+  - EXT_GIT_BRANCH = 'master'
+  - EXT_USER = 'beetbox'
+  - EXT_REPO = 'beets'
   - LS_USER = 'linuxserver'
   - LS_REPO = 'docker-beets'
   - CONTAINER_NAME = 'beets'

package_versions.txt

@@ -1,151 +1,114 @@
-musl musl-1.1.19-r10
-busybox busybox-1.28.4-r3
-alpine-baselayout alpine-baselayout-3.1.0-r0
-alpine-keys alpine-keys-2.1-r1
-libressl2.7-libcrypto libressl2.7-libcrypto-2.7.5-r0
-libressl2.7-libssl libressl2.7-libssl-2.7.5-r0
-libressl2.7-libtls libressl2.7-libtls-2.7.5-r0
-ssl_client ssl_client-1.28.4-r3
-zlib zlib-1.2.11-r1
-apk-tools apk-tools-2.10.1-r0
-scanelf scanelf-1.2.3-r0
-musl-utils musl-utils-1.1.19-r10
-libc-utils libc-utils-0.7.1-r0
-xz-libs xz-libs-5.2.4-r0
-xz xz-5.2.4-r0
-ca-certificates ca-certificates-20171114-r3
-ncurses-terminfo-base ncurses-terminfo-base-6.1_p20180818-r1
-ncurses-terminfo ncurses-terminfo-6.1_p20180818-r1
-ncurses-libs ncurses-libs-6.1_p20180818-r1
-readline readline-7.0.003-r0
-bash bash-4.4.19-r1
-libattr libattr-2.4.47-r7
-libacl libacl-2.2.52-r5
-coreutils coreutils-8.29-r2
-linux-pam linux-pam-1.3.0-r0
-shadow shadow-4.5-r0
-tzdata tzdata-2018f-r0
-libbz2 libbz2-1.0.6-r6
-expat expat-2.2.5-r0
-nghttp2-libs nghttp2-libs-1.32.0-r0
-libssh2 libssh2-1.8.0-r3
-libcurl libcurl-7.61.1-r2
-libgcc libgcc-6.4.0-r9
-libstdc++ libstdc++-6.4.0-r9
-sdl2 sdl2-2.0.8-r1
-libxau libxau-1.0.8-r2
-libbsd libbsd-0.8.6-r2
-libxdmcp libxdmcp-1.1.2-r4
-libxcb libxcb-1.13-r2
-libx11 libx11-1.6.6-r0
-alsa-lib alsa-lib-1.1.6-r0
-libpng libpng-1.6.34-r1
-freetype freetype-2.9.1-r1
-fontconfig fontconfig-2.12.6-r1
-fribidi fribidi-1.0.2-r0
-libass libass-0.13.7-r1
-gmp gmp-6.1.2-r1
-nettle nettle-3.4-r1
-libffi libffi-3.2.1-r4
-p11-kit p11-kit-0.23.10-r0
-libtasn1 libtasn1-4.13-r0
-libunistring libunistring-0.9.7-r0
-gnutls gnutls-3.6.2-r0
-lame lame-3.100-r0
-opus opus-1.2.1-r1
-librtmp librtmp-2.4_git20160909-r5
-libogg libogg-1.3.3-r2
-libtheora libtheora-1.1.1-r13
-libjpeg-turbo libjpeg-turbo-1.5.3-r4
-v4l-utils-libs v4l-utils-libs-1.12.6-r1
-libxext libxext-1.3.3-r2
-libxfixes libxfixes-5.0.3-r1
-libpciaccess libpciaccess-0.13.5-r1
-libdrm libdrm-2.4.92-r0
-libva libva-2.1.0-r1
-libvdpau libvdpau-1.1.1-r1
-libvorbis libvorbis-1.3.6-r2
-libvpx libvpx-1.6.1-r0
-x264-libs x264-libs-20180304-r1
-x265 x265-2.7-r1
-xvidcore xvidcore-1.3.4-r1
-ffmpeg-libs ffmpeg-libs-3.4.4-r1
-fftw-double-libs fftw-double-libs-3.3.6p2-r2
-fftw-long-double-libs fftw-long-double-libs-3.3.6p2-r2
-fftw-single-libs fftw-single-libs-3.3.6p2-r2
-mpg123 mpg123-1.25.10-r0
-openjpeg openjpeg-2.3.0-r1
-gdbm gdbm-1.13-r1
-sqlite-libs sqlite-libs-3.25.3-r0
-python3 python3-3.6.6-r0
-curl curl-7.61.1-r2
-ffmpeg ffmpeg-3.4.4-r1
-fftw fftw-3.3.6p2-r2
-flac flac-1.3.2-r2
-libxdamage libxdamage-1.1.4-r1
-libraw1394 libraw1394-2.1.2-r1
-libavc1394 libavc1394-0.5.4-r2
-giflib giflib-5.1.4-r2
-libid3tag libid3tag-0.15.1b-r7
-tiff tiff-4.0.10-r0
-imlib2 imlib2-1.5.1-r0
-libcaca libcaca-0.99_beta19-r2
-libxrender libxrender-0.9.10-r2
-pixman pixman-0.34.0-r5
-cairo cairo-1.14.12-r2
-libintl libintl-0.19.8.1-r2
-libuuid libuuid-2.32-r0
-libblkid libblkid-2.32-r0
-libmount libmount-2.32-r0
-pcre pcre-8.42-r0
-glib glib-2.56.1-r0
-cairo-gobject cairo-gobject-1.14.12-r2
-libdv libdv-1.0.0-r3
-libxml2 libxml2-2.9.8-r1
-shared-mime-info shared-mime-info-1.9-r0
-gdk-pixbuf gdk-pixbuf-2.36.11-r2
-wayland-libs-server wayland-libs-server-1.15.0-r0
-mesa-gbm mesa-gbm-18.0.5-r0
-mesa-glapi mesa-glapi-18.0.5-r0
-wayland-libs-client wayland-libs-client-1.15.0-r0
-libxshmfence libxshmfence-1.2-r2
-mesa-egl mesa-egl-18.0.5-r0
-libxxf86vm libxxf86vm-1.1.4-r1
-mesa-gl mesa-gl-18.0.5-r0
-libxv libxv-1.0.11-r1
-cdparanoia-libs cdparanoia-libs-10.2-r7
-gstreamer gstreamer-1.14.0-r0
-orc orc-0.4.28-r0
-libxft libxft-2.3.2-r2
-graphite2 graphite2-1.3.11-r1
-harfbuzz harfbuzz-1.7.6-r1
-pango pango-1.40.14-r1
-wayland-libs-egl wayland-libs-egl-1.15.0-r0
-gst-plugins-base gst-plugins-base-1.14.0-r1
-eudev-libs eudev-libs-3.2.5-r2
-libgudev libgudev-230-r2
-libiec61883 libiec61883-1.2.0-r2
-dbus-libs dbus-libs-1.10.24-r1
-libsndfile libsndfile-1.0.28-r5
-libsamplerate libsamplerate-0.1.9-r1
-jack jack-1.9.10-r5
-speex speex-1.2.0-r0
-libshout libshout-2.4.1-r4
-libproxy libproxy-0.4.15-r1
-glib-networking glib-networking-2.54.1-r1
-libsoup libsoup-2.62.1-r0
-taglib taglib-1.11.1-r1
-wavpack wavpack-5.1.0-r7
-gst-plugins-good gst-plugins-good-1.14.0-r0
-libjpeg-turbo-utils libjpeg-turbo-utils-1.5.3-r4
-jpeg jpeg-8-r6
-oniguruma oniguruma-6.8.2-r0
-jq jq-1.6_rc1-r1
-libmagic libmagic-5.32-r0
-nano nano-2.9.8-r0
-py3-cairo py3-cairo-1.16.3-r0
-gobject-introspection gobject-introspection-1.56.1-r0
-py3-gobject3 py3-gobject3-3.28.2-r0
-py3-pylast py3-pylast-2.3.0-r0
-tar tar-1.32-r0
-wget wget-1.20.1-r0
+alpine-baselayout-3.1.0-r3
+alpine-keys-2.1-r1
+alsa-lib-1.1.8-r0
+apk-tools-2.10.3-r1
+bash-4.4.19-r1
+busybox-1.29.3-r10
+ca-certificates-20190108-r0
+ca-certificates-cacert-20190108-r0
+coreutils-8.30-r0
+curl-7.64.0-r1
+expat-2.2.6-r0
+ffmpeg-4.0.2-r0
+ffmpeg-libs-4.0.2-r0
+fftw-3.3.8-r0
+fftw-double-libs-3.3.8-r0
+fftw-long-double-libs-3.3.8-r0
+fftw-single-libs-3.3.8-r0
+fontconfig-2.13.1-r0
+freetype-2.9.1-r2
+fribidi-1.0.5-r0
+gdbm-1.13-r1
+gmp-6.1.2-r1
+gnutls-3.6.7-r0
+jq-1.6-r0
+lame-3.100-r0
+lcms2-2.9-r1
+libacl-2.2.52-r5
+libass-0.14.0-r0
+libattr-2.4.47-r7
+libbsd-0.8.6-r2
+libbz2-1.0.6-r6
+libc-utils-0.7.1-r0
+libcrypto1.1-1.1.1b-r1
+libcurl-7.64.0-r1
+libdrm-2.4.96-r0
+libffi-3.2.1-r6
+libgcc-8.3.0-r0
+libjpeg-turbo-1.5.3-r4
+libmagic-5.36-r0
+libogg-1.3.3-r2
+libpciaccess-0.14-r0
+libpng-1.6.37-r0
+libssh2-1.8.2-r0
+libssl1.1-1.1.1b-r1
+libstdc++-8.3.0-r0
+libtasn1-4.13-r0
+libtheora-1.1.1-r13
+libtls-standalone-2.7.4-r6
+libunistring-0.9.10-r0
+libuuid-2.33-r0
+libva-2.2.0-r0
+libvdpau-1.1.1-r2
+libvorbis-1.3.6-r2
+libvpx-1.6.1-r1
+libwebp-1.0.1-r0
+libx11-1.6.7-r0
+libxau-1.0.8-r3
+libxcb-1.13-r2
+libxdmcp-1.1.2-r5
+libxext-1.3.3-r3
+libxfixes-5.0.3-r2
+linux-pam-1.3.0-r0
+mpg123-1.25.10-r0
+musl-1.1.20-r4
+musl-utils-1.1.20-r4
+nano-3.2-r0
+ncurses-libs-6.1_p20190105-r0
+ncurses-terminfo-6.1_p20190105-r0
+ncurses-terminfo-base-6.1_p20190105-r0
+nettle-3.4.1-r0
+nghttp2-libs-1.35.1-r0
+oniguruma-6.9.1-r0
+openjpeg-2.3.0-r3
+opus-1.3-r0
+p11-kit-0.23.14-r0
+py-enum34-1.1.6-r2
+py3-beautifulsoup4-4.6.1-r0
+py3-certifi-2018.4.16-r0
+py3-chardet-3.0.4-r0
+py3-click-6.7-r2
+py3-flask-1.0.2-r1
+py3-idna-2.7-r0
+py3-itsdangerous-0.24-r3
+py3-jellyfish-0.6.1-r0
+py3-jinja2-2.10-r2
+py3-markupsafe-1.1.0-r0
+py3-munkres-1.0.12-r0
+py3-musicbrainzngs-0.6-r2
+py3-olefile-0.43-r2
+py3-pillow-5.4.1-r0
+py3-pylast-2.4.0-r0
+py3-requests-2.19.1-r0
+py3-setuptools-40.6.3-r0
+py3-six-1.11.0-r0
+py3-urllib3-1.22-r0
+py3-werkzeug-0.14.1-r0
+python3-3.6.8-r2
+readline-7.0.003-r1
+scanelf-1.2.3-r0
+sdl2-2.0.9-r0
+shadow-4.5-r1
+sqlite-libs-3.26.0-r3
+ssl_client-1.29.3-r10
+tar-1.32-r0
+tiff-4.0.10-r0
+tzdata-2019a-r0
+v4l-utils-libs-1.16.2-r0
+wget-1.20.3-r0
+x264-libs-20180304-r1
+x265-libs-2.8-r1
+xvidcore-1.3.4-r1
+xz-5.2.4-r0
+xz-libs-5.2.4-r0
+zlib-1.2.11-r1

readme-vars.yml

@@ -14,7 +14,7 @@ project_blurb_optional_extras: []
 available_architectures:
   - { arch: "{{ arch_x86_64 }}", tag: "amd64-latest"}
   - { arch: "{{ arch_arm64 }}", tag: "arm64v8-latest"}
-  - { arch: "{{ arch_armhf }}", tag: "arm32v6-latest"}
+  - { arch: "{{ arch_armhf }}", tag: "arm32v7-latest"}
 
 # container parameters
 common_param_env_vars_enabled: true #PGID, PUID, etc, you can set it to 'optional'
@@ -33,6 +33,7 @@ param_ports:
 
 # changelog
 changelogs:
+  - { date: "23.03.19:", desc: "Switching to new Base images, shift to arm32v7 tag." }
   - { date: "01.03.19:", desc: "Switch to python3." }
   - { date: "07.02.19:", desc: "Add fftw-dev build dependency for chromaprint." }
   - { date: "28.01.19:", desc: "Add pipeline logic and multi arch." }