From 9d0ec76c8253f0f69dae80e784ce6a2dcd14681c Mon Sep 17 00:00:00 2001
From: Alexandre <44178713+alexbelgium@users.noreply.github.com>
Date: Sun, 21 Feb 2021 08:38:19 +0100
Subject: [PATCH] build from upstream

---
 bitwarden/Dockerfile      | 3 ++-
 cloudcommander/Dockerfile | 4 ++--
 code-server/Dockerfile    | 4 ++--
 filebrowser/Dockerfile    | 3 ++-
 joal/Dockerfile           | 3 ++-
 nextcloud/Dockerfile      | 3 ++-
 papermerge/Dockerfile     | 3 ++-
 piwigo/Dockerfile         | 3 ++-
 qbittorrent/Dockerfile    | 3 ++-
 radarr/Dockerfile         | 3 ++-
 scrutiny/Dockerfile       | 3 ++-
 transmission/Dockerfile   | 4 ++--
 transmission/build.json   | 8 ++++----
 ubooquity/Dockerfile      | 3 ++-
 14 files changed, 30 insertions(+), 20 deletions(-)

diff --git a/bitwarden/Dockerfile b/bitwarden/Dockerfile
index 98c694f75..6477051ae 100644
--- a/bitwarden/Dockerfile
+++ b/bitwarden/Dockerfile
@@ -3,9 +3,10 @@ ARG BUILD_FROM=ghcr.io/hassio-addons/debian-base/amd64:4.0.0
 # Get prebuild containers from Bitwarden RS
 ###############################################################################
 ARG BUILD_VERSION
+ARG BUILD_UPSTREAM="1.19.0"
 
 # hadolint ignore=DL3006
-FROM "bitwardenrs/server:${BUILD_VERSION}" as bitwarden
+FROM "bitwardenrs/server:${BUILD_UPSTREAM}" as bitwarden
 
 ###############################################################################
 # Build the actual add-on.
diff --git a/cloudcommander/Dockerfile b/cloudcommander/Dockerfile
index 58f9aace4..ba7a8b53f 100644
--- a/cloudcommander/Dockerfile
+++ b/cloudcommander/Dockerfile
@@ -1,6 +1,6 @@
 ARG BUILD_VERSION
-
-FROM coderaiser/cloudcmd:$BUILD_VERSION
+ARG BUILD_UPSTREAM="15.7.0"
+FROM coderaiser/cloudcmd:$BUILD_UPSTREAM
 
 COPY run.sh /
 
diff --git a/code-server/Dockerfile b/code-server/Dockerfile
index 18cd37a5a..8a730f13a 100644
--- a/code-server/Dockerfile
+++ b/code-server/Dockerfile
@@ -1,7 +1,7 @@
 ARG BUILD_FROM
 ARG BUILD_VERSION
-
-FROM ${BUILD_FROM}${BUILD_VERSION}
+ARG BUILD_UPSTREAM="3.9.0"
+FROM ${BUILD_FROM}${BUILD_UPSTREAM}
 
 # Install bashio
 RUN apt-get update \
diff --git a/filebrowser/Dockerfile b/filebrowser/Dockerfile
index 19e376dad..9bfa9208e 100644
--- a/filebrowser/Dockerfile
+++ b/filebrowser/Dockerfile
@@ -1,5 +1,6 @@
 ARG BUILD_VERSION
-FROM "hurlenko/filebrowser:v2.11.0"
+ARG BUILD_UPSTREAM="2.11.0"
+FROM hurlenko/filebrowser:${BUILD_UPSTREAM}
 
 RUN apk add --no-cache \
     curl \
diff --git a/joal/Dockerfile b/joal/Dockerfile
index b8b0c7f27..6877a58c2 100644
--- a/joal/Dockerfile
+++ b/joal/Dockerfile
@@ -7,6 +7,7 @@ VOLUME [ "/data" ]
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 
 ARG BUILD_VERSION
+ARG BUILD_UPSTREAM="2.1.24/"
 
 RUN \
 #Install bashio
@@ -26,7 +27,7 @@ RUN \
     \
 #Install Joal
     # && curl -s -L -o /tmp/joal.tar.gz "https://github.com/anthonyraymond/joal/releases/download/2.1.24/joal.tar.gz" \
-    && wget -O /tmp/joal.tar.gz "https://github.com/anthonyraymond/joal/releases/download/$BUILD_VERSION/joal.tar.gz" \
+    && wget -O /tmp/joal.tar.gz "https://github.com/anthonyraymond/joal/releases/download/$BUILD_UPSTREAM/joal.tar.gz" \
     && mkdir -p /data/joal \
     && tar zxvf /tmp/joal.tar.gz -C /data/joal \
     && chown -R $(id -u):$(id -g) /data/joal \
diff --git a/nextcloud/Dockerfile b/nextcloud/Dockerfile
index 802ddb63d..3392639ea 100644
--- a/nextcloud/Dockerfile
+++ b/nextcloud/Dockerfile
@@ -1,7 +1,8 @@
 ARG BUILD_FROM
 ARG BUILD_VERSION
+ARG BUILD_UPSTREAM="20.0.7"
 
-FROM ${BUILD_FROM}${BUILD_VERSION}
+FROM ${BUILD_FROM}${BUILD_UPSTREAM}
 
 ENV NEXTCLOUD_PATH="/data/config/www/nextcloud"
 
diff --git a/papermerge/Dockerfile b/papermerge/Dockerfile
index b21a7d2c0..3469dca39 100644
--- a/papermerge/Dockerfile
+++ b/papermerge/Dockerfile
@@ -1,7 +1,8 @@
 ARG BUILD_FROM
 ARG BUILD_VERSION
+ARG BUILD_UPSTREAM="1.5.5"
 
-FROM ${BUILD_FROM}${BUILD_VERSION}
+FROM ${BUILD_FROM}${BUILD_UPSTREAM}
 
 # Add bashio
 RUN apt-get update \
diff --git a/piwigo/Dockerfile b/piwigo/Dockerfile
index a19c74295..bf9c6fc50 100644
--- a/piwigo/Dockerfile
+++ b/piwigo/Dockerfile
@@ -1,6 +1,7 @@
 ARG BUILD_FROM
 ARG BUILD_VERSION
-FROM ${BUILD_FROM}${BUILD_VERSION}
+ARG BUILD_UPSTREAM="11.3.0"
+FROM ${BUILD_FROM}${BUILD_UPSTREAM}
 
 # Copy root filesystem
 COPY rootfs / 
diff --git a/qbittorrent/Dockerfile b/qbittorrent/Dockerfile
index c2936f991..3688087d8 100644
--- a/qbittorrent/Dockerfile
+++ b/qbittorrent/Dockerfile
@@ -1,6 +1,7 @@
 ARG BUILD_FROM
 ARG BUILD_VERSION 
-FROM ${BUILD_FROM}${BUILD_VERSION}
+ARG BUILD_UPSTREAM="14.3.3.99202101191832-7248-da0b276d5ubuntu20.04.1-ls116"
+FROM ${BUILD_FROM}${BUILD_UPSTREAM}
 
 # Copy root filesystem
 COPY rootfs / 
diff --git a/radarr/Dockerfile b/radarr/Dockerfile
index 2fad446cd..35c28175b 100644
--- a/radarr/Dockerfile
+++ b/radarr/Dockerfile
@@ -1,7 +1,8 @@
 ARG BUILD_FROM
 ARG BUILD_VERSION
+ARG BUILD_UPSTREAM="3.0.2.4552"
+FROM ${BUILD_FROM}${BUILD_UPSTREAM}
 
-FROM ${BUILD_FROM}${BUILD_VERSION}
 
 RUN curl -J -L -o /tmp/bashio.tar.gz \
     "https://github.com/hassio-addons/bashio/archive/v0.7.1.tar.gz" \
diff --git a/scrutiny/Dockerfile b/scrutiny/Dockerfile
index a7936520e..37fbb57fc 100644
--- a/scrutiny/Dockerfile
+++ b/scrutiny/Dockerfile
@@ -1,6 +1,7 @@
 ARG BUILD_FROM
 ARG BUILD_VERSION
-FROM ${BUILD_FROM}${BUILD_VERSION}
+ARG BUILD_UPSTREAM="27b923b5-ls10"
+FROM ${BUILD_FROM}${BUILD_UPSTREAM}
 
 # Copy root filesystem
 COPY rootfs /
diff --git a/transmission/Dockerfile b/transmission/Dockerfile
index 0493a501b..f3ba1d3a9 100644
--- a/transmission/Dockerfile
+++ b/transmission/Dockerfile
@@ -1,7 +1,7 @@
 ARG BUILD_FROM
 ARG BUILD_VERSION
-
-FROM ${BUILD_FROM}-${BUILD_VERSION}
+ARG BUILD_UPSTREAM="3.00-r2-ls78"
+FROM ${BUILD_FROM}${BUILD_UPSTREAM}
 
 # Add bashio
 RUN apk add --no-cache \
diff --git a/transmission/build.json b/transmission/build.json
index 8591e0376..54a89041c 100644
--- a/transmission/build.json
+++ b/transmission/build.json
@@ -1,9 +1,9 @@
 {
     "build_from": {
-        "armv7": "linuxserver/transmission:arm32v7",
-        "armhf": "linuxserver/transmission:arm32v7",
-        "aarch64": "linuxserver/transmission:arm64v8",
-        "amd64": "linuxserver/transmission:amd64"
+        "armv7": "linuxserver/transmission:arm32v7-",
+        "armhf": "linuxserver/transmission:arm32v7-",
+        "aarch64": "linuxserver/transmission:arm64v8-",
+        "amd64": "linuxserver/transmission:amd64-"
     },
     "squash": false,
     "args": {}
diff --git a/ubooquity/Dockerfile b/ubooquity/Dockerfile
index 178064e16..f53b01d1d 100644
--- a/ubooquity/Dockerfile
+++ b/ubooquity/Dockerfile
@@ -1,6 +1,7 @@
 ARG BUILD_FROM
 ARG BUILD_VERSION
-FROM ${BUILD_FROM}${BUILD_VERSION}
+ARG BUILD_UPSTREAM="2.1.2-ls57"
+FROM ${BUILD_FROM}${BUILD_UPSTREAM}
 
 # Copy root filesystem
 COPY rootfs /