From eba4b9dc972173b502ef27956fe94c3265451cf2 Mon Sep 17 00:00:00 2001
From: thelamer <ryankuba@gmail.com>
Date: Mon, 11 Mar 2019 14:02:35 -0700
Subject: [PATCH] #47 #41 Swap copyartifacts for extrafiles, add gmusic-api,
 update endpoints with nightly tag

---
 Dockerfile         | 13 ++++++++++---
 Dockerfile.aarch64 | 13 ++++++++++---
 Dockerfile.armhf   | 13 ++++++++++---
 README.md          |  9 +++++++++
 readme-vars.yml    |  7 +++++++
 5 files changed, 46 insertions(+), 9 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 3d62d43..6c55912 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -18,10 +18,13 @@ RUN \
 	git \
 	jpeg-dev \
 	libpng-dev \
+	libxml2-dev \
+	libxslt-dev \
 	make \
 	mpg123-dev \
 	openjpeg-dev \
-	python3-dev && \
+	python3-dev \
+	zlib-dev && \
  echo "**** install runtime packages ****" && \
  apk add --no-cache --upgrade \
 	curl \
@@ -37,6 +40,8 @@ RUN \
 	lame \
 	libffi \
 	libpng \
+	libxml2 \
+	libxslt \
 	mpg123 \
 	nano \
 	openjpeg \
@@ -46,7 +51,8 @@ RUN \
 	python3 \
 	sqlite-libs \
 	tar \
-	wget && \
+	wget \
+	zlib && \
  echo "**** compile mp3gain ****" && \
  mkdir -p \
 	/tmp/mp3gain-src && \
@@ -76,9 +82,10 @@ RUN \
  pip3 install --no-cache-dir -U \
 	beautifulsoup4 \
 	beets==${BEETS_VERSION} \
-	beets-copyartifacts \
+	beets-extrafiles \
 	discogs-client \
 	flask \
+	gmusicapi \
 	pillow \
 	pip \
 	pyacoustid \
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index dee6b17..6b8cacc 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -21,10 +21,13 @@ RUN \
 	git \
 	jpeg-dev \
 	libpng-dev \
+	libxml2-dev \
+	libxslt-dev \
 	make \
 	mpg123-dev \
 	openjpeg-dev \
-	python3-dev && \
+	python3-dev \
+	zlib-dev && \
  echo "**** install runtime packages ****" && \
  apk add --no-cache --upgrade \
 	curl \
@@ -40,6 +43,8 @@ RUN \
 	lame \
 	libffi \
 	libpng \
+	libxml2 \
+	libxslt \
 	mpg123 \
 	nano \
 	openjpeg \
@@ -49,7 +54,8 @@ RUN \
 	python3 \
 	sqlite-libs \
 	tar \
-	wget && \
+	wget \
+	zlib && \
  echo "**** compile mp3gain ****" && \
  mkdir -p \
 	/tmp/mp3gain-src && \
@@ -79,9 +85,10 @@ RUN \
  pip3 install --no-cache-dir -U \
 	beautifulsoup4 \
 	beets==${BEETS_VERSION} \
-	beets-copyartifacts \
+	beets-extrafiles \
 	discogs-client \
 	flask \
+	gmusicapi \
 	pillow \
 	pip \
 	pyacoustid \
diff --git a/Dockerfile.armhf b/Dockerfile.armhf
index 6783fec..61f7511 100644
--- a/Dockerfile.armhf
+++ b/Dockerfile.armhf
@@ -21,10 +21,13 @@ RUN \
 	git \
 	jpeg-dev \
 	libpng-dev \
+	libxml2-dev \
+	libxslt-dev \
 	make \
 	mpg123-dev \
 	openjpeg-dev \
-	python3-dev && \
+	python3-dev \
+	zlib-dev && \
  echo "**** install runtime packages ****" && \
  apk add --no-cache --upgrade \
 	curl \
@@ -40,6 +43,8 @@ RUN \
 	lame \
 	libffi \
 	libpng \
+	libxml2 \
+	libxslt \
 	mpg123 \
 	nano \
 	openjpeg \
@@ -49,7 +54,8 @@ RUN \
 	python3 \
 	sqlite-libs \
 	tar \
-	wget && \
+	wget \
+	zlib && \
  echo "**** compile mp3gain ****" && \
  mkdir -p \
 	/tmp/mp3gain-src && \
@@ -79,9 +85,10 @@ RUN \
  pip3 install --no-cache-dir -U \
 	beautifulsoup4 \
 	beets==${BEETS_VERSION} \
-	beets-copyartifacts \
+	beets-extrafiles \
 	discogs-client \
 	flask \
+	gmusicapi \
 	pillow \
 	pip \
 	pyacoustid \
diff --git a/README.md b/README.md
index 6e601f3..77901b0 100644
--- a/README.md
+++ b/README.md
@@ -41,6 +41,14 @@ The architectures supported by this image are:
 | arm64 | arm64v8-latest |
 | armhf | arm32v6-latest |
 
+## Version Tags
+
+This image provides various versions that are available via tags. `latest` tag usually provides the latest stable version. Others are considered under development and caution must be exercised when using them.
+
+| Tag | Description |
+| :----: | --- |
+| latest | Stable Beets Releases |
+| nightly | Built against head of Beets git, generally considered unstable but a likely choice for power users of the application. |
 
 ## Usage
 
@@ -159,6 +167,7 @@ Below are the instructions for updating containers:
 
 ## Versions
 
+* **03.11.19:** - Swap copyartifacts for extrafiles, add gmusic-api, update endpoints with nightly 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.
diff --git a/readme-vars.yml b/readme-vars.yml
index db9e350..24454de 100644
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -16,6 +16,12 @@ available_architectures:
   - { arch: "{{ arch_arm64 }}", tag: "arm64v8-latest"}
   - { arch: "{{ arch_armhf }}", tag: "arm32v6-latest"}
 
+# development version
+development_versions: true
+development_versions_items:
+  - { tag: "latest", desc: "Stable Beets Releases" }
+  - { tag: "nightly", desc: "Built against head of Beets git, generally considered unstable but a likely choice for power users of the application." }
+
 # container parameters
 common_param_env_vars_enabled: true #PGID, PUID, etc, you can set it to 'optional'
 param_container_name: "{{ project_name }}"
@@ -33,6 +39,7 @@ param_ports:
 
 # changelog
 changelogs:
+  - { date: "03.11.19:", desc: "Swap copyartifacts for extrafiles, add gmusic-api, update endpoints with nightly 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." }