From 8cb4129b7ec63580a2d449f0d84973fdf49ba798 Mon Sep 17 00:00:00 2001
From: Alexandre <44178713+alexbelgium@users.noreply.github.com>
Date: Mon, 2 Aug 2021 09:47:31 +0200
Subject: [PATCH] align with latest for build

Align build tags with latest to take into account intermediate ls versions
---
 bazarr/Dockerfile          |  3 +--
 bazarr/build.json          |  8 ++++----
 cloudcommander/Dockerfile  |  3 +--
 code-server/Dockerfile     |  3 +--
 code-server/build.json     | 13 ++++++-------
 doublecommander/Dockerfile |  5 ++---
 doublecommander/build.json | 16 ++++++++--------
 emby/Dockerfile            |  4 +---
 emby/build.json            | 12 ++++++------
 flexget/Dockerfile         |  1 -
 jackett/Dockerfile         |  3 +--
 jackett/build.json         |  8 ++++----
 jellyfin/Dockerfile        |  4 +---
 jellyfin/build.json        |  8 ++++----
 nextcloud/Dockerfile       |  2 +-
 nextcloud/build.json       |  8 ++++----
 ombi/Dockerfile            |  3 +--
 ombi/build.json            |  8 ++++----
 papermerge/Dockerfile      |  3 +--
 papermerge/build.json      | 13 ++++++-------
 piwigo/Dockerfile          |  3 +--
 piwigo/build.json          | 12 ++++++------
 plex/Dockerfile            |  3 +--
 plex/build.json            |  8 ++++----
 24 files changed, 69 insertions(+), 85 deletions(-)

diff --git a/bazarr/Dockerfile b/bazarr/Dockerfile
index 1b4df2354..63304f5dd 100644
--- a/bazarr/Dockerfile
+++ b/bazarr/Dockerfile
@@ -1,7 +1,6 @@
 ARG BUILD_FROM
 ARG BUILD_VERSION
-ARG BUILD_UPSTREAM="0.9.6"
-FROM ${BUILD_FROM}${BUILD_UPSTREAM}
+FROM ${BUILD_FROM}
 ARG BASHIO_VERSION=0.13.0
 
 RUN \
diff --git a/bazarr/build.json b/bazarr/build.json
index 56fb57a5c..46914db8f 100644
--- a/bazarr/build.json
+++ b/bazarr/build.json
@@ -1,8 +1,8 @@
 {
   "build_from": {
-    "armhf": "linuxserver/bazarr:arm32v7-version-v",
-    "armv7": "linuxserver/bazarr:arm32v7-version-v",
-    "aarch64": "linuxserver/bazarr:arm64v8-version-v",
-    "amd64": "linuxserver/bazarr:amd64-version-v"
+    "armhf": "linuxserver/bazarr:arm32v7-latest",
+    "armv7": "linuxserver/bazarr:arm32v7-latest",
+    "aarch64": "linuxserver/bazarr:arm64v8-latest",
+    "amd64": "linuxserver/bazarr:amd64-latest"
   }
 }
diff --git a/cloudcommander/Dockerfile b/cloudcommander/Dockerfile
index 0a097b2d4..14c3ea483 100644
--- a/cloudcommander/Dockerfile
+++ b/cloudcommander/Dockerfile
@@ -1,6 +1,5 @@
 ARG BUILD_VERSION
-ARG BUILD_UPSTREAM="15.9.7"
-FROM coderaiser/cloudcmd:$BUILD_UPSTREAM
+FROM coderaiser/cloudcmd:latest
 
 COPY run.sh /
 
diff --git a/code-server/Dockerfile b/code-server/Dockerfile
index c354980a2..0dcdfe844 100644
--- a/code-server/Dockerfile
+++ b/code-server/Dockerfile
@@ -1,7 +1,6 @@
 ARG BUILD_FROM
 ARG BUILD_VERSION
-ARG BUILD_UPSTREAM="3.11.0"
-FROM ${BUILD_FROM}${BUILD_UPSTREAM}
+FROM ${BUILD_FROM}
 
 # Install bashio
 RUN apt-get update \
diff --git a/code-server/build.json b/code-server/build.json
index 98b63e222..a8503c6cc 100644
--- a/code-server/build.json
+++ b/code-server/build.json
@@ -1,9 +1,8 @@
 {
-    "build_from": {
-        "armv7": "linuxserver/code-server:arm32v7-version-v",
-        "armhf": "linuxserver/code-server:arm32v7-version-v",
-        "aarch64": "linuxserver/code-server:arm64v8-version-v",
-        "amd64": "linuxserver/code-server:amd64-version-v"
-    }
+  "build_from": {
+    "armv7": "linuxserver/code-server:arm32v7-latest",
+    "armhf": "linuxserver/code-server:arm32v7-latest",
+    "aarch64": "linuxserver/code-server:arm64v8-latest",
+    "amd64": "linuxserver/code-server:amd64-latest"
+  }
 }
-
diff --git a/doublecommander/Dockerfile b/doublecommander/Dockerfile
index fc5f399e0..7bb321f2e 100644
--- a/doublecommander/Dockerfile
+++ b/doublecommander/Dockerfile
@@ -1,7 +1,6 @@
 ARG BUILD_FROM
 ARG BUILD_VERSION
-ARG BUILD_UPSTREAM="0.8.2-1-ls54"
-FROM ${BUILD_FROM}${BUILD_UPSTREAM}
+FROM ${BUILD_FROM}
 
 # Install bashio
 RUN apt-get update \
@@ -9,7 +8,7 @@ RUN apt-get update \
     jq \
     samba \
     && curl -J -L -o /tmp/bashio.tar.gz \
-    "https://github.com/hassio-addons/bashio/archive/v0.7.1.tar.gz" \
+    "https://github.com/hassio-addons/bashio/archive/v0.13.0.tar.gz" \
     && mkdir /tmp/bashio \
     && tar zxvf \
     /tmp/bashio.tar.gz \
diff --git a/doublecommander/build.json b/doublecommander/build.json
index efa69b319..7dd0eaf25 100644
--- a/doublecommander/build.json
+++ b/doublecommander/build.json
@@ -1,10 +1,10 @@
 {
-    "build_from": {
-        "armv7": "linuxserver/doublecommander:arm32v7-",
-        "armhf": "linuxserver/doublecommander:arm32v7-",
-        "aarch64": "linuxserver/doublecommander:arm64v8-",
-        "amd64": "linuxserver/doublecommander:amd64-"
-    },
-    "squash": false,
-    "args": {}
+  "build_from": {
+    "armv7": "linuxserver/doublecommander:arm32v7-latest",
+    "armhf": "linuxserver/doublecommander:arm32v7-latest",
+    "aarch64": "linuxserver/doublecommander:arm64v8-latest",
+    "amd64": "linuxserver/doublecommander:amd64-latest"
+  },
+  "squash": false,
+  "args": {}
 }
diff --git a/emby/Dockerfile b/emby/Dockerfile
index da185c914..b2f8ad198 100644
--- a/emby/Dockerfile
+++ b/emby/Dockerfile
@@ -1,8 +1,6 @@
 ARG BUILD_FROM
 ARG BUILD_VERSION
-ARG BUILD_UPSTREAM="4.6.4.0"
-
-FROM ${BUILD_FROM}${BUILD_UPSTREAM}
+FROM ${BUILD_FROM}
 ARG BASHIO_VERSION=0.13.0
 ARG TEMPIO_VERSION=2021.01.0
 
diff --git a/emby/build.json b/emby/build.json
index 059fcaafe..93bb062e6 100644
--- a/emby/build.json
+++ b/emby/build.json
@@ -1,8 +1,8 @@
 {
-    "build_from": {
-        "armv7": "linuxserver/emby:arm32v7-version-",
-        "armhf": "linuxserver/emby:arm32v7-version-",
-        "aarch64": "linuxserver/emby:arm64v8-version-",
-        "amd64": "linuxserver/emby:amd64-version-"
-    }
+  "build_from": {
+    "armv7": "linuxserver/emby:arm32v7-latest",
+    "armhf": "linuxserver/emby:arm32v7-latest",
+    "aarch64": "linuxserver/emby:arm64v8-latest",
+    "amd64": "linuxserver/emby:amd64-latest"
+  }
 }
diff --git a/flexget/Dockerfile b/flexget/Dockerfile
index fa02eff5f..9b9417838 100644
--- a/flexget/Dockerfile
+++ b/flexget/Dockerfile
@@ -1,6 +1,5 @@
 ARG BUILD_FROM
 ARG BUILD_VERSION
-ARG BUILD_UPSTREAM="3.1.133"
 FROM wiserain/flexget:latest
 
 RUN \
diff --git a/jackett/Dockerfile b/jackett/Dockerfile
index 7561ff622..33dd7dee6 100644
--- a/jackett/Dockerfile
+++ b/jackett/Dockerfile
@@ -1,7 +1,6 @@
 ARG BUILD_FROM
 ARG BUILD_VERSION
-ARG BUILD_UPSTREAM="0.18.515"
-FROM ${BUILD_FROM}${BUILD_UPSTREAM}
+FROM ${BUILD_FROM}
 
 
 RUN curl -J -L -o /tmp/bashio.tar.gz \
diff --git a/jackett/build.json b/jackett/build.json
index 801a1627c..7247b0363 100644
--- a/jackett/build.json
+++ b/jackett/build.json
@@ -1,8 +1,8 @@
 {
   "build_from": {
-    "armhf": "linuxserver/jackett:arm32v7-version-v",
-    "armv7": "linuxserver/jackett:arm32v7-version-v",
-    "aarch64": "linuxserver/jackett:arm64v8-version-v",
-    "amd64": "linuxserver/jackett:amd64-version-v"
+    "armhf": "linuxserver/jackett:arm32v7-latest",
+    "armv7": "linuxserver/jackett:arm32v7-latest",
+    "aarch64": "linuxserver/jackett:arm64v8-latest",
+    "amd64": "linuxserver/jackett:amd64-latest"
   }
 }
diff --git a/jellyfin/Dockerfile b/jellyfin/Dockerfile
index 2cd3147df..a2ef7e852 100644
--- a/jellyfin/Dockerfile
+++ b/jellyfin/Dockerfile
@@ -1,8 +1,6 @@
 ARG BUILD_FROM
 ARG BUILD_VERSION
-ARG BUILD_UPSTREAM="10.7.6-1-ls118"
-
-FROM ${BUILD_FROM}${BUILD_UPSTREAM}
+FROM ${BUILD_FROM}
 
 # Set shell
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
diff --git a/jellyfin/build.json b/jellyfin/build.json
index a03cb2155..ebde6af63 100644
--- a/jellyfin/build.json
+++ b/jellyfin/build.json
@@ -1,8 +1,8 @@
 {
   "build_from": {
-    "armv7": "linuxserver/jellyfin:arm32v7-",
-    "armhf": "linuxserver/jellyfin:arm32v7-",
-    "aarch64": "linuxserver/jellyfin:arm64v8-",
-    "amd64": "linuxserver/jellyfin:amd64-"
+    "armv7": "linuxserver/jellyfin:arm32v7-latest",
+    "armhf": "linuxserver/jellyfin:arm32v7-latest",
+    "aarch64": "linuxserver/jellyfin:arm64v8-latest",
+    "amd64": "linuxserver/jellyfin:amd64-latest"
   }
 }
diff --git a/nextcloud/Dockerfile b/nextcloud/Dockerfile
index 1868bc920..99f58b21a 100644
--- a/nextcloud/Dockerfile
+++ b/nextcloud/Dockerfile
@@ -2,7 +2,7 @@ ARG BUILD_FROM
 ARG BUILD_VERSION
 ARG BUILD_UPSTREAM="22.0.0"
 
-FROM ${BUILD_FROM}${BUILD_UPSTREAM}
+FROM ${BUILD_FROM}
 
 ENV NEXTCLOUD_PATH="/data/config/www/nextcloud"
 
diff --git a/nextcloud/build.json b/nextcloud/build.json
index a1f4564d5..2ddac7ec3 100644
--- a/nextcloud/build.json
+++ b/nextcloud/build.json
@@ -1,10 +1,10 @@
 {
   "squash": false,
   "build_from": {
-    "aarch64": "linuxserver/nextcloud:arm64v8-version-",
-    "amd64": "linuxserver/nextcloud:amd64-version-",
-    "armhf": "linuxserver/nextcloud:arm32v7-version-",
-    "armv7": "linuxserver/nextcloud:arm32v7-version-"
+    "aarch64": "linuxserver/nextcloud:arm64v8-latest",
+    "amd64": "linuxserver/nextcloud:amd64-latest",
+    "armhf": "linuxserver/nextcloud:arm32v7-latest",
+    "armv7": "linuxserver/nextcloud:arm32v7-latest"
   },
   "args": {}
 }
diff --git a/ombi/Dockerfile b/ombi/Dockerfile
index 36474f2ba..3065a72e1 100644
--- a/ombi/Dockerfile
+++ b/ombi/Dockerfile
@@ -1,7 +1,6 @@
 ARG BUILD_FROM
 ARG BUILD_VERSION
-ARG BUILD_UPSTREAM="4.0.1430"
-FROM ${BUILD_FROM}${BUILD_UPSTREAM}
+FROM ${BUILD_FROM}
 
 RUN \
     ################
diff --git a/ombi/build.json b/ombi/build.json
index e02fe30fa..123aeef1c 100644
--- a/ombi/build.json
+++ b/ombi/build.json
@@ -1,8 +1,8 @@
 {
   "build_from": {
-    "armhf": "linuxserver/ombi:arm32v7-version-v",
-    "armv7": "linuxserver/ombi:arm32v7-version-v",
-    "aarch64": "linuxserver/ombi:arm64v8-version-v",
-    "amd64": "linuxserver/ombi:amd64-version-v"
+    "armhf": "linuxserver/ombi:arm32v7-latest",
+    "armv7": "linuxserver/ombi:arm32v7-latest",
+    "aarch64": "linuxserver/ombi:arm64v8-latest",
+    "amd64": "linuxserver/ombi:amd64-latest"
   }
 }
diff --git a/papermerge/Dockerfile b/papermerge/Dockerfile
index 0eff0d1d3..d68be348b 100644
--- a/papermerge/Dockerfile
+++ b/papermerge/Dockerfile
@@ -1,9 +1,8 @@
 ARG BUILD_FROM
 ARG BUILD_VERSION
-ARG BUILD_UPSTREAM="2.0.1"
 ARG BASHIO_VERSION=0.13.0
 
-FROM ${BUILD_FROM}${BUILD_UPSTREAM}
+FROM ${BUILD_FROM}
 
 # Add bashio
 RUN \
diff --git a/papermerge/build.json b/papermerge/build.json
index 7cf525e71..f293b09e7 100644
--- a/papermerge/build.json
+++ b/papermerge/build.json
@@ -1,9 +1,8 @@
 {
-    "build_from": {
-        "armv7": "linuxserver/papermerge:arm32v7-version-v",
-        "armhf": "linuxserver/papermerge:arm32v7-version-v",
-        "aarch64": "linuxserver/papermerge:arm64v8-version-v",
-        "amd64": "linuxserver/papermerge:amd64-version-v"
-    }
+  "build_from": {
+    "armv7": "linuxserver/papermerge:arm32v7-latest",
+    "armhf": "linuxserver/papermerge:arm32v7-latest",
+    "aarch64": "linuxserver/papermerge:arm64v8-latest",
+    "amd64": "linuxserver/papermerge:amd64-latest"
+  }
 }
-
diff --git a/piwigo/Dockerfile b/piwigo/Dockerfile
index 4feb04d07..cd6b04258 100644
--- a/piwigo/Dockerfile
+++ b/piwigo/Dockerfile
@@ -1,7 +1,6 @@
 ARG BUILD_FROM
 ARG BUILD_VERSION
-ARG BUILD_UPSTREAM="11.5.0"
-FROM ${BUILD_FROM}${BUILD_UPSTREAM}
+FROM ${BUILD_FROM}
 
 # Copy root filesystem
 COPY rootfs / 
diff --git a/piwigo/build.json b/piwigo/build.json
index c2140b552..6c75f13b1 100644
--- a/piwigo/build.json
+++ b/piwigo/build.json
@@ -1,8 +1,8 @@
 {
-    "build_from": {
-        "armv7": "linuxserver/piwigo:arm32v7-version-",
-        "armhf": "linuxserver/piwigo:arm32v7-version-",
-        "aarch64": "linuxserver/piwigo:arm64v8-version-",
-        "amd64": "linuxserver/piwigo:amd64-version-"
-    }
+  "build_from": {
+    "armv7": "linuxserver/piwigo:arm32v7-latest",
+    "armhf": "linuxserver/piwigo:arm32v7-latest",
+    "aarch64": "linuxserver/piwigo:arm64v8-latest",
+    "amd64": "linuxserver/piwigo:amd64-latest"
+  }
 }
diff --git a/plex/Dockerfile b/plex/Dockerfile
index 927c8538a..e84d58a0e 100644
--- a/plex/Dockerfile
+++ b/plex/Dockerfile
@@ -1,9 +1,8 @@
 ARG BUILD_FROM
 ARG BUILD_VERSION
-ARG BUILD_UPSTREAM="1.23.6.4881-e2e58f321-ls65"
 ARG BASHIO_VERSION=0.13.0
 
-FROM ${BUILD_FROM}${BUILD_UPSTREAM}
+FROM ${BUILD_FROM}
 
 # Set shell
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
diff --git a/plex/build.json b/plex/build.json
index ee29255a4..ca0dde75b 100644
--- a/plex/build.json
+++ b/plex/build.json
@@ -1,8 +1,8 @@
 {
   "build_from": {
-    "armv7": "linuxserver/plex:arm32v7-",
-    "armhf": "linuxserver/plex:arm32v7-",
-    "aarch64": "linuxserver/plex:arm64v8-",
-    "amd64": "linuxserver/plex:amd64-"
+    "armv7": "linuxserver/plex:arm32v7-latest",
+    "armhf": "linuxserver/plex:arm32v7-latest",
+    "aarch64": "linuxserver/plex:arm64v8-latest",
+    "amd64": "linuxserver/plex:amd64-latest"
   }
 }