Updated project dependencies, specifically Flyway

Updated log4j version to mitigate CVE

.gitignore

@@ -37,3 +37,6 @@ src/main/resources/log4j2.xml
 .classpath
 .project
 .settings/
+.vscode/
+
+**/.DS_Store

build.gradle

@@ -2,60 +2,43 @@ plugins {
     id 'java'
 }
 
-sourceCompatibility = 11
-targetCompatibility = 11
+sourceCompatibility = JavaVersion.VERSION_11
+targetCompatibility = JavaVersion.VERSION_11
 
 repositories {
     mavenCentral()
 }
 
-version = '2.0.4'
-
-sourceSets {
-
-    main {
-
-        java {
-            srcDir 'src/main/java'
-        }
-    }
-
-    test {
-
-        java {
-            srcDir 'src/test/java'
-        }
-    }
-}
+version = '2.3.3'
 
 dependencies {
 
     // Logging
-    runtime 'org.apache.logging.log4j:log4j-api:2.11.1'
-    runtime 'org.apache.logging.log4j:log4j-core:2.11.1'
-    compile 'org.apache.logging.log4j:log4j-slf4j-impl:2.11.1'
+    implementation 'org.apache.logging.log4j:log4j-api:2.19.0'
+    implementation 'org.apache.logging.log4j:log4j-core:2.19.0'
+    implementation 'org.apache.logging.log4j:log4j-slf4j-impl:2.19.0'
 
     // HTTP Framework
-    compile 'io.javalin:javalin:3.6.0'
-    compile 'org.freemarker:freemarker:2.3.28'
-    compile 'org.apache.httpcomponents:httpclient:4.5.7'
+    implementation 'io.javalin:javalin:3.6.0'
+    implementation 'org.freemarker:freemarker:2.3.31'
+    implementation 'org.apache.httpcomponents:httpclient:4.5.13'
 
     // JSON Mapping/Marshalling
-    compile 'com.fasterxml.jackson.core:jackson-databind:2.9.6'
-    compile 'com.fasterxml.jackson.core:jackson-core:2.9.6'
-    compile 'com.fasterxml.jackson.core:jackson-annotations:2.9.6'
+    implementation 'com.fasterxml.jackson.core:jackson-databind:2.9.6'
+    implementation 'com.fasterxml.jackson.core:jackson-core:2.9.6'
+    implementation 'com.fasterxml.jackson.core:jackson-annotations:2.9.6'
 
     // Database
-    compile 'com.zaxxer:HikariCP:3.3.1'
-    compile 'org.mariadb.jdbc:mariadb-java-client:2.4.0'
-    compile 'org.flywaydb:flyway-core:6.1.0'
+    runtimeOnly    'org.mariadb.jdbc:mariadb-java-client:3.0.6'
+    implementation 'org.flywaydb:flyway-core:8.2.0'
+    implementation 'com.zaxxer:HikariCP:5.0.1'
 
     // MISC
-    compile 'org.apache.commons:commons-lang3:3.7'
+    implementation 'org.apache.commons:commons-lang3:3.12.0'
 
     // Unit Testing
-    testCompile 'junit:junit:4.11'
-    testCompile 'org.mockito:mockito-core:1.10.19'
+    testImplementation 'junit:junit:4.11'
+    testImplementation 'org.mockito:mockito-core:4.8.0'
 }
 
 jar {
@@ -65,9 +48,11 @@ jar {
     }
 
     from {
-        configurations.compile.collect { it.isDirectory() ? it : zipTree(it) }
+        configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) }
     }
 
+    duplicatesStrategy = DuplicatesStrategy.INCLUDE
+
     exclude 'META-INF/INDEX.LIST', 'META-INF/*.RSA', 'META-INF/*.SF','META-INF/*.DSA'
 }
 
@@ -97,4 +82,4 @@ task buildVersionProperties() {
     }
 }
 
-build.dependsOn configureLogConfiguration, buildVersionProperties
+processResources.dependsOn configureLogConfiguration, buildVersionProperties

config/example.fleet.properties

@@ -9,3 +9,8 @@ fleet.database.driver=org.mariadb.jdbc.Driver
 fleet.database.url=jdbc:mariadb://<IP_OR_URL>:3306/fleet
 fleet.database.username=<fleet_sql_user>
 fleet.database.password=<fleet_sql_password>
+
+# DockerHub auth
+fleet.dockerhub.auth.enabled=true
+fleet.dockerhub.username=YOUR_USERNAME
+fleet.dockerhub.password=YOUR_PASSWORD_OR_AUTH_TOKEN

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -1,78 +1,129 @@
-#!/usr/bin/env sh
+#!/bin/sh
+
+#
+# Copyright © 2015-2021 the original authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
 
 ##############################################################################
-##
-##  Gradle start up script for UN*X
-##
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
 ##############################################################################
 
 # Attempt to set APP_HOME
+
 # Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
 done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
+
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
+APP_BASE_NAME=${0##*/}
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+MAX_FD=maximum
 
 warn () {
     echo "$*"
-}
+} >&2
 
 die () {
     echo
     echo "$*"
     echo
     exit 1
-}
+} >&2
 
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
 esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
+
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
         # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
+        JAVACMD=$JAVA_HOME/jre/sh/java
     else
-        JAVACMD="$JAVA_HOME/bin/java"
+        JAVACMD=$JAVA_HOME/bin/java
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -81,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
-    JAVACMD="java"
+    JAVACMD=java
     which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
@@ -89,84 +140,95 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=$((i+1))
-    done
-    case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
 fi
 
-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=$(save "$@")
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
 
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
 
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
 fi
 
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
+
 exec "$JAVACMD" "$@"

gradlew.bat

@@ -1,3 +1,19 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
 @if "%DEBUG%" == "" @echo off
 @rem ##########################################################################
 @rem
@@ -13,15 +29,18 @@ if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if "%ERRORLEVEL%" == "0" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -35,7 +54,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -45,28 +64,14 @@ echo location of your Java installation.
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
 :execute
 @rem Setup the command line
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
+
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell

src/main/java/io/linuxserver/fleet/core/FleetAppController.java

@@ -21,7 +21,11 @@ import io.linuxserver.fleet.auth.AuthenticationResult;
 import io.linuxserver.fleet.core.config.WebConfiguration;
 import io.linuxserver.fleet.v2.client.docker.DockerApiClient;
 import io.linuxserver.fleet.v2.client.docker.dockerhub.DockerHubApiClient;
+import io.linuxserver.fleet.v2.client.docker.dockerhub.DockerHubAuthenticator;
+import io.linuxserver.fleet.v2.client.docker.dockerhub.IDockerHubAuthenticator;
+import io.linuxserver.fleet.v2.client.docker.dockerhub.NoOpDockerHubAuthenticator;
 import io.linuxserver.fleet.v2.client.docker.queue.DockerApiDelegate;
+import io.linuxserver.fleet.v2.client.rest.RestClient;
 import io.linuxserver.fleet.v2.db.DefaultImageDAO;
 import io.linuxserver.fleet.v2.db.DefaultScheduleDAO;
 import io.linuxserver.fleet.v2.db.DefaultUserDAO;
@@ -56,7 +60,7 @@ public class FleetAppController extends AbstractAppController implements Service
         fileManager       = new FileManager(this);
         imageService      = new ImageService(this, new DefaultImageDAO(getDatabaseProvider()));
         scheduleService   = new ScheduleService(this, new DefaultScheduleDAO(getDatabaseProvider()));
-        dockerApiDelegate = new DockerApiDelegate(this);
+        dockerApiDelegate = new DockerApiDelegate(this, configureDockerApiClient());
         syncService       = new SynchronisationService(this);
         userService       = new UserService(this, new DefaultUserDAO(getDatabaseProvider()));
     }
@@ -97,10 +101,6 @@ public class FleetAppController extends AbstractAppController implements Service
 
     }
 
-    public final DockerApiClient getDockerClient() {
-        return new DockerHubApiClient();
-    }
-
     public final boolean synchroniseImage(final ImageKey imageKey) {
         return syncService.synchroniseImage(imageKey);
     }
@@ -165,4 +165,16 @@ public class FleetAppController extends AbstractAppController implements Service
         getImageService().trackBranchOnImage(imageKey, branchName);
         synchroniseImage(imageKey);
     }
+
+    private DockerApiClient configureDockerApiClient() {
+
+        final RestClient dockerHubApiRestClient = new RestClient();
+        final IDockerHubAuthenticator dockerHubAuthenticator;
+        if (getAppProperties().isDockerHubAuthEnabled()) {
+            dockerHubAuthenticator = new DockerHubAuthenticator(getAppProperties().getDockerHubCredentials(), dockerHubApiRestClient);
+        } else {
+            dockerHubAuthenticator = new NoOpDockerHubAuthenticator();
+        }
+        return new DockerHubApiClient(dockerHubApiRestClient, dockerHubAuthenticator);
+    }
 }

src/main/java/io/linuxserver/fleet/core/config/AppProperties.java

@@ -18,6 +18,7 @@
 package io.linuxserver.fleet.core.config;
 
 import io.linuxserver.fleet.core.FleetRuntime;
+import io.linuxserver.fleet.v2.client.docker.dockerhub.DockerHubCredentials;
 
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -77,6 +78,18 @@ public class AppProperties {
         return Integer.parseInt(getStringProperty("fleet.app.port"));
     }
 
+    public boolean isDockerHubAuthEnabled() {
+        return "true".equalsIgnoreCase(getStringProperty("fleet.dockerhub.auth.enabled"));
+    }
+
+    public DockerHubCredentials getDockerHubCredentials() {
+
+        final String username = getStringProperty("fleet.dockerhub.username");
+        final String password = getStringProperty("fleet.dockerhub.password");
+
+        return new DockerHubCredentials(username, password);
+    }
+
     /**
      * <p>
      * Obtains the property value from three separate sources: first from the config file. If not present, it will look

src/main/java/io/linuxserver/fleet/db/migration/DatabaseVersion.java

@@ -36,7 +36,6 @@ public class DatabaseVersion {
     private final Flyway flyway;
 
     public DatabaseVersion(final DatabaseConnection databaseConnection) {
-
         flyway = Flyway.configure().dataSource(databaseConnection.getDataSource()).load();
         migrate();
     }

src/main/java/io/linuxserver/fleet/dockerhub/util/DockerTagFinder.java

@@ -18,8 +18,11 @@
 package io.linuxserver.fleet.dockerhub.util;
 
 import io.linuxserver.fleet.v2.types.docker.DockerTag;
+import io.linuxserver.fleet.v2.types.docker.DockerTagManifestDigest;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
 
 public class DockerTagFinder {
@@ -32,11 +35,46 @@ public class DockerTagFinder {
 
             DockerTag namedTagForBranch = tagBranchName.get();
             Optional<DockerTag> versionedLatestTag = tags.stream()
-                .filter(tag -> !tag.equals(namedTagForBranch) && tag.getSize() == namedTagForBranch.getSize()).findFirst();
+                .filter(tag -> !tag.equals(namedTagForBranch) && allManifestsMatch(namedTagForBranch, tag)).findFirst();
 
             return versionedLatestTag.orElse(namedTagForBranch);
         }
 
         return tags.isEmpty() ? null : tags.get(0);
     }
+
+    private static boolean allManifestsMatch(final DockerTag namedTag, final DockerTag toCheck) {
+
+        final List<DockerTagManifestDigest> namedDigests   = namedTag.getDigests();
+        final List<DockerTagManifestDigest> digestsToCheck = toCheck.getDigests();
+
+        boolean allMatch = true;
+
+        if (namedDigests.size() == digestsToCheck.size()) {
+
+            final Map<String, String> namedDigestsAsMap = toMapKeyedByArch(namedDigests);
+
+            for (DockerTagManifestDigest digestToCheck : digestsToCheck) {
+
+                final String archPlusVariant = digestToCheck.getArchitecture() + digestToCheck.getArchVariant();
+                final String foundDigest     = namedDigestsAsMap.get(archPlusVariant);
+
+                allMatch = allMatch && (null != foundDigest) && foundDigest.equals(digestToCheck.getDigest());
+            }
+
+        } else {
+            allMatch = false;
+        }
+
+        return allMatch;
+    }
+
+    private static Map<String, String> toMapKeyedByArch(final List<DockerTagManifestDigest> initialList) {
+
+        final Map<String, String> map = new HashMap<>();
+        for (DockerTagManifestDigest digest : initialList) {
+            map.put(digest.getArchitecture() + digest.getArchVariant(), digest.getDigest());
+        }
+        return map;
+    }
 }

src/main/java/io/linuxserver/fleet/v2/client/docker/AbstractDockerApiClient.java

@@ -0,0 +1,60 @@
+/*
+ * Copyright (c)  2020 LinuxServer.io
+ *
+ * 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/>.
+ */
+
+package io.linuxserver.fleet.v2.client.docker;
+
+import io.linuxserver.fleet.v2.client.docker.converter.DockerResponseConverter;
+import io.linuxserver.fleet.v2.types.docker.DockerImage;
+import io.linuxserver.fleet.v2.types.docker.DockerTag;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+public abstract class AbstractDockerApiClient<D, T, IC extends DockerResponseConverter<D, DockerImage>, TC extends DockerResponseConverter<T, DockerTag>> implements DockerApiClient {
+
+    private final IC imageConverter;
+    private final TC tagConverter;
+
+    public AbstractDockerApiClient(final IC imageConverter, final TC tagConverter) {
+        this.imageConverter = imageConverter;
+        this.tagConverter   = tagConverter;
+    }
+
+    @Override
+    public final DockerImage fetchImage(String imageName) {
+
+        final D dockerModel = fetchImageFromApi(imageName);
+        if (null == dockerModel) {
+            return null;
+        }
+        return imageConverter.convert(dockerModel);
+    }
+
+    @Override
+    public final List<DockerImage> fetchAllImages(String repositoryName) {
+        return fetchAllImagesFromApi(repositoryName).stream().map(imageConverter::convert).collect(Collectors.toList());
+    }
+
+    @Override
+    public final List<DockerTag> fetchImageTags(String imageName) {
+        return fetchTagsFromApi(imageName).stream().map(tagConverter::convert).collect(Collectors.toList());
+    }
+
+    protected abstract D       fetchImageFromApi(final String imageName);
+    protected abstract List<D> fetchAllImagesFromApi(final String repositoryName);
+    protected abstract List<T> fetchTagsFromApi(final String imageName);
+}

src/main/java/io/linuxserver/fleet/v2/client/docker/converter/AbstractDockerResponseConverter.java

@@ -15,28 +15,27 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package io.linuxserver.fleet.v2.client.docker.dockerhub;
+package io.linuxserver.fleet.v2.client.docker.converter;
 
-import io.linuxserver.fleet.v2.client.docker.converter.DockerResponseConverter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.time.LocalDateTime;
 import java.time.format.DateTimeParseException;
 
-public abstract class AbstractDockerHubConverter<DOCKER_HUB, INTERNAL> implements DockerResponseConverter<DOCKER_HUB, INTERNAL> {
+public abstract class AbstractDockerResponseConverter<D, I> implements DockerResponseConverter<D, I> {
 
     private final Logger LOGGER = LoggerFactory.getLogger(getClass());
 
     @Override
-    public final INTERNAL convert(final DOCKER_HUB dockerHubV2Image) {
+    public final I convert(final D dockerModel) {
 
         try {
 
-            if (null == dockerHubV2Image) {
+            if (null == dockerModel) {
                 LOGGER.warn("Attempted to convert null image");
             } else {
-                return doPlainConvert(dockerHubV2Image);
+                return doPlainConvert(dockerModel);
             }
 
         } catch (Exception e) {
@@ -46,7 +45,7 @@ public abstract class AbstractDockerHubConverter<DOCKER_HUB, INTERNAL> implement
         return null;
     }
 
-    protected abstract INTERNAL doPlainConvert(final DOCKER_HUB dockerHubV2Image);
+    protected abstract I doPlainConvert(final D dockerApiImage);
 
     protected final LocalDateTime parseDockerHubDate(String date) {
 

src/main/java/io/linuxserver/fleet/v2/client/docker/dockerhub/DockerHubApiClient.java

@@ -20,42 +20,70 @@ package io.linuxserver.fleet.v2.client.docker.dockerhub;
 import io.linuxserver.fleet.dockerhub.DockerHubException;
 import io.linuxserver.fleet.dockerhub.model.DockerHubV2Image;
 import io.linuxserver.fleet.dockerhub.model.DockerHubV2ImageListResult;
+import io.linuxserver.fleet.dockerhub.model.DockerHubV2Tag;
 import io.linuxserver.fleet.dockerhub.model.DockerHubV2TagListResult;
-import io.linuxserver.fleet.v2.client.docker.DockerApiClient;
+import io.linuxserver.fleet.v2.Utils;
+import io.linuxserver.fleet.v2.client.docker.AbstractDockerApiClient;
 import io.linuxserver.fleet.v2.client.rest.HttpException;
 import io.linuxserver.fleet.v2.client.rest.RestClient;
 import io.linuxserver.fleet.v2.client.rest.RestResponse;
-import io.linuxserver.fleet.v2.types.docker.DockerImage;
-import io.linuxserver.fleet.v2.types.docker.DockerTag;
 
 import java.util.ArrayList;
 import java.util.List;
 
-public class DockerHubApiClient implements DockerApiClient {
+public class DockerHubApiClient extends AbstractDockerApiClient<DockerHubV2Image, DockerHubV2Tag, DockerHubImageConverter, DockerHubTagConverter> {
 
-    private static final String DockerHubApiUrl = "https://hub.docker.com/v2";
+    public static final String  DockerHubApiUrl = "https://hub.docker.com/v2";
     private static final int    DefaultPageSize = 1000;
 
-    private final RestClient restClient;
+    private final RestClient              restClient;
+    private final IDockerHubAuthenticator authenticator;
 
-    private final DockerHubImageConverter imageConverter;
-    private final DockerHubTagConverter   tagConverter;
-
-    public DockerHubApiClient() {
-
-        restClient     = new RestClient();
-        imageConverter = new DockerHubImageConverter();
-        tagConverter   = new DockerHubTagConverter();
+    public DockerHubApiClient(final RestClient restClient,
+                              final IDockerHubAuthenticator authenticator) {
+        super(new DockerHubImageConverter(), new DockerHubTagConverter());
+        this.restClient    = Utils.ensureNotNull(restClient);
+        this.authenticator = Utils.ensureNotNull(authenticator);
     }
 
     @Override
-    public List<DockerImage> fetchAllImages(String repositoryName) {
+    public final boolean isRepositoryValid(String repositoryName) {
 
-        final List<DockerImage> images = new ArrayList<>();
+        try {
+            return !fetchAllImages(repositoryName).isEmpty();
+        } catch (HttpException e) {
+            throw new DockerHubException("Unable to verify repository " + repositoryName, e);
+        }
+    }
+
+    @Override
+    protected final DockerHubV2Image fetchImageFromApi(String imageName) {
 
         try {
 
-            String url = DockerHubApiUrl + "/repositories/" + repositoryName + "?page_size=" + DefaultPageSize;
+            final  String absoluteUrl = DockerHubApiUrl + "/repositories/" + imageName + "/";
+
+            final RestResponse<DockerHubV2Image> restResponse = doCall(absoluteUrl, DockerHubV2Image.class);
+
+            if (isResponseOK(restResponse)) {
+                return restResponse.getPayload();
+            }
+
+            return null;
+
+        } catch (HttpException e) {
+            throw new DockerHubException("Unable to get images for " + imageName, e);
+        }
+    }
+
+    @Override
+    protected final List<DockerHubV2Image> fetchAllImagesFromApi(String repositoryName) {
+
+        final List<DockerHubV2Image> images = new ArrayList<>();
+
+        try {
+
+            String url = DockerHubApiUrl + "/repositories/" + repositoryName + "/?page_size=" + DefaultPageSize;
             while (url != null) {
 
                 final RestResponse<DockerHubV2ImageListResult> response = doCall(url, DockerHubV2ImageListResult.class);
@@ -63,13 +91,7 @@ public class DockerHubApiClient implements DockerApiClient {
                 if (isResponseOK(response)) {
 
                     DockerHubV2ImageListResult payload = response.getPayload();
-                    payload.getResults().forEach(i -> {
-
-                        final DockerImage converted = imageConverter.convert(i);
-                        if (null != converted) {
-                            images.add(converted);
-                        }
-                    });
+                    images.addAll(payload.getResults());
 
                     url = payload.getNext();
                 }
@@ -83,43 +105,13 @@ public class DockerHubApiClient implements DockerApiClient {
     }
 
     @Override
-    public boolean isRepositoryValid(String repositoryName) {
-
-        try {
-            return !fetchAllImages(repositoryName).isEmpty();
-        } catch (HttpException e) {
-            throw new DockerHubException("Unable to verify repository " + repositoryName, e);
-        }
-    }
-
-    @Override
-    public DockerImage fetchImage(String imageName) {
+    protected final List<DockerHubV2Tag> fetchTagsFromApi(String imageName) {
 
         try {
 
-            final  String absoluteUrl = DockerHubApiUrl + "/repositories/" + imageName;
+            List<DockerHubV2Tag> tags = new ArrayList<>();
 
-            final RestResponse<DockerHubV2Image> restResponse = doCall(absoluteUrl, DockerHubV2Image.class);
-
-            if (isResponseOK(restResponse)) {
-                return imageConverter.convert(restResponse.getPayload());
-            }
-
-            return null;
-
-        } catch (HttpException e) {
-            throw new DockerHubException("Unable to get images for " + imageName, e);
-        }
-    }
-
-    @Override
-    public List<DockerTag> fetchImageTags(String imageName) {
-
-        try {
-
-            List<DockerTag> tags = new ArrayList<>();
-
-            String absoluteUrl = DockerHubApiUrl + "/repositories/" + imageName + "/tags?page_size=" + DefaultPageSize;
+            String absoluteUrl = DockerHubApiUrl + "/repositories/" + imageName + "/tags/?page_size=" + DefaultPageSize;
             while (absoluteUrl != null) {
 
                 final RestResponse<DockerHubV2TagListResult> response = doCall(absoluteUrl, DockerHubV2TagListResult.class);
@@ -127,13 +119,7 @@ public class DockerHubApiClient implements DockerApiClient {
                 if (isResponseOK(response)) {
 
                     final DockerHubV2TagListResult payload = response.getPayload();
-                    payload.getResults().forEach(t -> {
-
-                        final DockerTag converted = tagConverter.convert(t);
-                        if (null != converted) {
-                            tags.add(converted);
-                        }
-                    });
+                    tags.addAll(payload.getResults());
 
                     absoluteUrl = payload.getNext();
                 }
@@ -153,10 +139,21 @@ public class DockerHubApiClient implements DockerApiClient {
      * </p>
      */
     private <T> RestResponse<T> doCall(String url, Class<T> responseType) {
-        return restClient.executeGet(url, null, null, responseType);
+
+        RestResponse<T> restResponse = restClient.executeGet(url, null, authenticator.buildAuthHeaders(), responseType);
+        if (isResponseUnauthorised(restResponse)) {
+
+            authenticator.refreshToken();
+            restResponse = restClient.executeGet(url, null, authenticator.buildAuthHeaders(), responseType);
+        }
+        return restResponse;
     }
 
     private boolean isResponseOK(final RestResponse<?> restResponse) {
         return restResponse.getStatusCode() == 200;
     }
+
+    private boolean isResponseUnauthorised(RestResponse restResponse) {
+        return restResponse.getStatusCode() == 401;
+    }
 }

src/main/java/io/linuxserver/fleet/v2/client/docker/dockerhub/DockerHubAuthenticator.java

@@ -0,0 +1,83 @@
+package io.linuxserver.fleet.v2.client.docker.dockerhub;
+
+import io.linuxserver.fleet.dockerhub.DockerHubException;
+import io.linuxserver.fleet.v2.client.rest.RestClient;
+import io.linuxserver.fleet.v2.client.rest.RestResponse;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class DockerHubAuthenticator implements IDockerHubAuthenticator {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(DockerHubAuthenticator.class);
+
+    private final RestClient           client;
+    private final DockerHubCredentials credentials;
+
+    private String token;
+
+    public DockerHubAuthenticator(final DockerHubCredentials credentials, final RestClient client) {
+
+        this.credentials = credentials;
+        this.client = client;
+
+        refreshToken();
+    }
+
+    /**
+     * <p>
+     * Re-authenticates with Docker Hub to obtain a fresh JWT.
+     * </p>
+     *
+     * @return
+     *      The new JWT to be used in authenticated requests.
+     */
+    public synchronized String refreshToken() {
+
+        LOGGER.info("Refreshing token for Docker Hub authentication");
+
+        final RestResponse<DockerHubTokenResponse> authenticationResponse = client.executePost(
+                DockerHubApiClient.DockerHubApiUrl + "/users/login", null, null, credentials, DockerHubTokenResponse.class);
+
+        if (authenticationResponse.getStatusCode() == 200) {
+
+            LOGGER.info("Refresh successful");
+
+            final String token = authenticationResponse.getPayload().getToken();
+            this.token = token;
+
+            return token;
+        }
+
+        LOGGER.info("Unable to refresh token.");
+
+        throw new DockerHubException("Unable to authenticate with Docker Hub. Check credentials");
+    }
+
+    synchronized String getCurrentToken() {
+
+        if (null == token) {
+            return refreshToken();
+        }
+        return token;
+    }
+
+    @Override
+    public Map<String, String> buildAuthHeaders() {
+
+        final Map<String, String> authHeaders = new HashMap<>();
+        authHeaders.put("Authorization", "JWT " + getCurrentToken());
+        return authHeaders;
+    }
+
+    static class DockerHubTokenResponse {
+
+        private String token;
+
+        public String getToken() {
+            return token;
+        }
+    }
+}

src/main/java/io/linuxserver/fleet/v2/client/docker/dockerhub/DockerHubCredentials.java

@@ -0,0 +1,23 @@
+package io.linuxserver.fleet.v2.client.docker.dockerhub;
+
+import io.linuxserver.fleet.v2.Utils;
+
+public class DockerHubCredentials {
+
+    private final String username;
+    private final String password;
+
+    public DockerHubCredentials(final String username,
+                                final String password) {
+        this.username = Utils.ensureNotNull(username);
+        this.password = Utils.ensureNotNull(password);
+    }
+
+    public final String getUsername() {
+        return username;
+    }
+
+    public final String getPassword() {
+        return password;
+    }
+}

src/main/java/io/linuxserver/fleet/v2/client/docker/dockerhub/DockerHubImageConverter.java

@@ -18,19 +18,20 @@
 package io.linuxserver.fleet.v2.client.docker.dockerhub;
 
 import io.linuxserver.fleet.dockerhub.model.DockerHubV2Image;
+import io.linuxserver.fleet.v2.client.docker.converter.AbstractDockerResponseConverter;
 import io.linuxserver.fleet.v2.types.docker.DockerImage;
 
-public class DockerHubImageConverter extends AbstractDockerHubConverter<DockerHubV2Image, DockerImage> {
+public class DockerHubImageConverter extends AbstractDockerResponseConverter<DockerHubV2Image, DockerImage> {
 
     @Override
-    protected final DockerImage doPlainConvert(final DockerHubV2Image dockerHubV2Image) {
+    protected final DockerImage doPlainConvert(final DockerHubV2Image dockerApiImage) {
 
-        return new DockerImage(dockerHubV2Image.getName(),
-                               dockerHubV2Image.getNamespace(),
-                               dockerHubV2Image.getDescription(),
-                               dockerHubV2Image.getStarCount(),
-                               dockerHubV2Image.getPullCount(),
-                               parseDockerHubDate(dockerHubV2Image.getLastUpdated()));
+        return new DockerImage(dockerApiImage.getName(),
+                               dockerApiImage.getNamespace(),
+                               dockerApiImage.getDescription(),
+                               dockerApiImage.getStarCount(),
+                               dockerApiImage.getPullCount(),
+                               parseDockerHubDate(dockerApiImage.getLastUpdated()));
     }
 
     @Override

src/main/java/io/linuxserver/fleet/v2/client/docker/dockerhub/DockerHubTagConverter.java

@@ -19,19 +19,20 @@ package io.linuxserver.fleet.v2.client.docker.dockerhub;
 
 import io.linuxserver.fleet.dockerhub.model.DockerHubV2Tag;
 import io.linuxserver.fleet.dockerhub.model.DockerHubV2TagDigest;
+import io.linuxserver.fleet.v2.client.docker.converter.AbstractDockerResponseConverter;
 import io.linuxserver.fleet.v2.types.docker.DockerTag;
 import io.linuxserver.fleet.v2.types.docker.DockerTagManifestDigest;
 
-public class DockerHubTagConverter extends AbstractDockerHubConverter<DockerHubV2Tag, DockerTag> {
+public class DockerHubTagConverter extends AbstractDockerResponseConverter<DockerHubV2Tag, DockerTag> {
 
     @Override
-    protected final DockerTag doPlainConvert(final DockerHubV2Tag dockerHubV2Tag) {
+    protected final DockerTag doPlainConvert(final DockerHubV2Tag dockerApiImage) {
 
-        final DockerTag dockerTag = new DockerTag(dockerHubV2Tag.getName(),
-                                                  dockerHubV2Tag.getFullSize(),
-                                                  parseDockerHubDate(dockerHubV2Tag.getLastUpdated()));
+        final DockerTag dockerTag = new DockerTag(dockerApiImage.getName(),
+                                                  dockerApiImage.getFullSize(),
+                                                  parseDockerHubDate(dockerApiImage.getLastUpdated()));
 
-        for (DockerHubV2TagDigest tagImageDigest : dockerHubV2Tag.getImages()) {
+        for (DockerHubV2TagDigest tagImageDigest : dockerApiImage.getImages()) {
 
             dockerTag.addDigest(new DockerTagManifestDigest(tagImageDigest.getSize(),
                                                             tagImageDigest.getDigest(),

src/main/java/io/linuxserver/fleet/v2/client/docker/dockerhub/IDockerHubAuthenticator.java

@@ -0,0 +1,10 @@
+package io.linuxserver.fleet.v2.client.docker.dockerhub;
+
+import java.util.Map;
+
+public interface IDockerHubAuthenticator {
+
+    Map<String, String> buildAuthHeaders();
+
+    String refreshToken();
+}

src/main/java/io/linuxserver/fleet/v2/client/docker/dockerhub/NoOpDockerHubAuthenticator.java

@@ -0,0 +1,17 @@
+package io.linuxserver.fleet.v2.client.docker.dockerhub;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class NoOpDockerHubAuthenticator implements IDockerHubAuthenticator {
+
+    @Override
+    public Map<String, String> buildAuthHeaders() {
+        return new HashMap<>();
+    }
+
+    @Override
+    public String refreshToken() {
+        return null;
+    }
+}

src/main/java/io/linuxserver/fleet/v2/client/docker/github/GitHubContainerRegistryClient.java

@@ -0,0 +1,51 @@
+/*
+ * Copyright (c)  2020 LinuxServer.io
+ *
+ * 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/>.
+ */
+
+package io.linuxserver.fleet.v2.client.docker.github;
+
+import io.linuxserver.fleet.v2.client.docker.AbstractDockerApiClient;
+import io.linuxserver.fleet.v2.client.docker.github.model.GitHubImage;
+import io.linuxserver.fleet.v2.client.docker.github.model.GitHubTag;
+
+import java.util.List;
+
+public class GitHubContainerRegistryClient extends AbstractDockerApiClient<GitHubImage, GitHubTag, GitHubImageConverter, GitHubTagConverter> {
+
+    public GitHubContainerRegistryClient() {
+        super(new GitHubImageConverter(), new GitHubTagConverter());
+    }
+
+    @Override
+    protected final GitHubImage fetchImageFromApi(String imageName) {
+        return null;
+    }
+
+    @Override
+    protected final List<GitHubImage> fetchAllImagesFromApi(String repositoryName) {
+        return null;
+    }
+
+    @Override
+    protected final List<GitHubTag> fetchTagsFromApi(String imageName) {
+        return null;
+    }
+
+    @Override
+    public final boolean isRepositoryValid(String repositoryName) {
+        return false;
+    }
+}

src/main/java/io/linuxserver/fleet/v2/client/docker/github/GitHubImageConverter.java

@@ -0,0 +1,35 @@
+/*
+ * Copyright (c)  2020 LinuxServer.io
+ *
+ * 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/>.
+ */
+
+package io.linuxserver.fleet.v2.client.docker.github;
+
+import io.linuxserver.fleet.v2.client.docker.converter.AbstractDockerResponseConverter;
+import io.linuxserver.fleet.v2.client.docker.github.model.GitHubImage;
+import io.linuxserver.fleet.v2.types.docker.DockerImage;
+
+public class GitHubImageConverter extends AbstractDockerResponseConverter<GitHubImage, DockerImage> {
+
+    @Override
+    protected final DockerImage doPlainConvert(final GitHubImage dockerApiImage) {
+        return null;
+    }
+
+    @Override
+    public final Class<GitHubImage> getConverterClass() {
+        return GitHubImage.class;
+    }
+}

src/main/java/io/linuxserver/fleet/v2/client/docker/github/GitHubTagConverter.java

@@ -0,0 +1,35 @@
+/*
+ * Copyright (c)  2020 LinuxServer.io
+ *
+ * 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/>.
+ */
+
+package io.linuxserver.fleet.v2.client.docker.github;
+
+import io.linuxserver.fleet.v2.client.docker.converter.AbstractDockerResponseConverter;
+import io.linuxserver.fleet.v2.client.docker.github.model.GitHubTag;
+import io.linuxserver.fleet.v2.types.docker.DockerTag;
+
+public class GitHubTagConverter extends AbstractDockerResponseConverter<GitHubTag, DockerTag> {
+
+    @Override
+    protected final DockerTag doPlainConvert(final GitHubTag dockerApiImage) {
+        return null;
+    }
+
+    @Override
+    public final Class<GitHubTag> getConverterClass() {
+        return GitHubTag.class;
+    }
+}

src/main/java/io/linuxserver/fleet/v2/client/docker/github/model/GitHubImage.java

@@ -0,0 +1,21 @@
+/*
+ * Copyright (c)  2020 LinuxServer.io
+ *
+ * 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/>.
+ */
+
+package io.linuxserver.fleet.v2.client.docker.github.model;
+
+public class GitHubImage {
+}

src/main/java/io/linuxserver/fleet/v2/client/docker/github/model/GitHubTag.java

@@ -0,0 +1,21 @@
+/*
+ * Copyright (c)  2020 LinuxServer.io
+ *
+ * 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/>.
+ */
+
+package io.linuxserver.fleet.v2.client.docker.github.model;
+
+public class GitHubTag {
+}

src/main/java/io/linuxserver/fleet/v2/client/docker/queue/DockerApiDelegate.java

@@ -18,6 +18,7 @@
 package io.linuxserver.fleet.v2.client.docker.queue;
 
 import io.linuxserver.fleet.core.FleetAppController;
+import io.linuxserver.fleet.v2.Utils;
 import io.linuxserver.fleet.v2.client.docker.DockerApiClient;
 import io.linuxserver.fleet.v2.client.docker.DockerImageNotFoundException;
 import io.linuxserver.fleet.v2.key.ImageKey;
@@ -33,9 +34,10 @@ public class DockerApiDelegate implements AsyncTaskDelegate {
     private final FleetAppController controller;
     private final DockerApiClient    apiClient;
 
-    public DockerApiDelegate(final FleetAppController controller) {
+    public DockerApiDelegate(final FleetAppController controller,
+                             final DockerApiClient dockerApiClient) {
         this.controller = controller;
-        this.apiClient  = controller.getDockerClient();
+        this.apiClient  = Utils.ensureNotNull(dockerApiClient);
     }
 
     public final boolean isRepositoryValid(final String repositoryName) {

src/main/java/io/linuxserver/fleet/v2/db/ImageTemplateFactory.java

@@ -37,7 +37,7 @@ public class ImageTemplateFactory {
     private static final String StoreTemplateBase      = "{CALL Image_StoreTemplateBase(?,?,?,?,?,?)}";
     private static final String StoreTemplatePort      = "{CALL Image_StoreTemplatePort(?,?,?,?)}";
     private static final String StoreTemplateVolume    = "{CALL Image_StoreTemplateVolume(?,?,?,?)}";
-    private static final String StoreTemplateEnv       = "{CALL Image_StoreTemplateEnv(?,?,?)}";
+    private static final String StoreTemplateEnv       = "{CALL Image_StoreTemplateEnv(?,?,?,?)}";
     private static final String StoreTemplateDevice    = "{CALL Image_StoreTemplateDevice(?,?,?)}";
     private static final String StoreTemplateExtra     = "{CALL Image_StoreTemplateExtra(?,?,?)}";
 
@@ -152,7 +152,7 @@ public class ImageTemplateFactory {
                         break;
 
                     case "Env":
-                        templateHolder.addEnvironment(new EnvironmentTemplateItem(itemName, itemDesc));
+                        templateHolder.addEnvironment(new EnvironmentTemplateItem(itemName, itemDesc, itemSec));
                         break;
 
                     case "Device":
@@ -245,7 +245,8 @@ public class ImageTemplateFactory {
             int i = 1;
             storeEnvCall.setInt(   i++, image.getKey().getId());
             storeEnvCall.setString(i++, env.getEnv());
-            storeEnvCall.setString(i,   env.getDescription());
+            storeEnvCall.setString(i++, env.getDescription());
+            storeEnvCall.setString(i,   env.getExampleValue());
             storeEnvCall.addBatch();
         }
 

src/main/java/io/linuxserver/fleet/v2/service/util/TemplateMerger.java

@@ -70,8 +70,8 @@ public class TemplateMerger {
 
     private void addEnvironment(final ImageTemplateRequest request, final ImageTemplateHolder holder) {
 
-        for (ImageTemplateRequest.TemplateItem<Void> env : request.getEnvironment()) {
-            holder.addEnvironment(new EnvironmentTemplateItem(env.getName(), env.getDescription()));
+        for (ImageTemplateRequest.TemplateItem<String> env : request.getEnvironment()) {
+            holder.addEnvironment(new EnvironmentTemplateItem(env.getName(), env.getDescription(), env.getSecondaryField()));
         }
     }
     private void addDevices(final ImageTemplateRequest request, final ImageTemplateHolder holder) {

src/main/java/io/linuxserver/fleet/v2/types/TagDigest.java

@@ -17,7 +17,9 @@
 
 package io.linuxserver.fleet.v2.types;
 
-public class TagDigest {
+import java.util.Objects;
+
+public class TagDigest implements Comparable<TagDigest> {
 
     private final long   size;
     private final String digest;
@@ -47,4 +49,41 @@ public class TagDigest {
     public final String getArchVariant() {
         return archVariant;
     }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(digest, architecture, archVariant);
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+
+        if (null == obj) {
+            return false;
+        }
+
+        if (!(obj instanceof TagDigest)) {
+            return false;
+        }
+
+        final TagDigest other = (TagDigest) obj;
+
+        return Objects.equals(digest,       other.digest) &&
+               Objects.equals(architecture, other.architecture) &&
+               Objects.equals(archVariant,  other.archVariant);
+    }
+
+    @Override
+    public String toString() {
+        return "DIGEST:" + digest + "--" + architecture + "/" + archVariant;
+    }
+
+    @Override
+    public int compareTo(TagDigest o) {
+
+        if (null == o) {
+            return 1;
+        }
+        return toString().compareTo(o.toString());
+    }
 }

src/main/java/io/linuxserver/fleet/v2/types/api/external/AllImagesExternalApiResponse.java

@@ -30,17 +30,21 @@ public class AllImagesExternalApiResponse {
         this.repositories   = new HashMap<>();
     }
 
-    public final void addImage(final String repositoryName,
-                               final String imageName,
-                               final long pullCount,
-                               final String version,
-                               final boolean stable) {
+    public final ExternalApiImage addImage(final String repositoryName,
+                                           final String imageName,
+                                           final long pullCount,
+                                           final String version,
+                                           final String category,
+                                           final boolean stable,
+                                           final boolean deprecated) {
 
         if (!repositories.containsKey(repositoryName)) {
             repositories.put(repositoryName, new ArrayList<>());
         }
 
-        repositories.get(repositoryName).add(new ExternalApiImage(imageName, pullCount, version, stable));
+        final ExternalApiImage apiImage = new ExternalApiImage(imageName, pullCount, version, category, stable, deprecated);
+        repositories.get(repositoryName).add(apiImage);
+        return apiImage;
     }
 
     public final long getTotalPullCount() {

src/main/java/io/linuxserver/fleet/v2/types/api/external/ExternalApiImage.java

@@ -17,18 +17,26 @@
 
 package io.linuxserver.fleet.v2.types.api.external;
 
+import io.linuxserver.fleet.v2.types.api.external.templates.ApiTemplateHolder;
+
 public class ExternalApiImage {
 
-    private String  name;
-    private long    pullCount;
-    private String  version;
-    private boolean stable;
+    private final String  name;
+    private final long    pullCount;
+    private final String  version;
+    private final String  category;
+    private final boolean stable;
+    private final boolean deprecated;
 
-    public ExternalApiImage(final String name, final long pullCount, final String version, final boolean stable) {
-        this.name      = name;
-        this.pullCount = pullCount;
-        this.version   = version;
-        this.stable    = stable;
+    private ApiTemplateHolder templateSpec;
+
+    public ExternalApiImage(final String name, final long pullCount, final String version, final String category, final boolean stable, final boolean deprecated) {
+        this.name       = name;
+        this.pullCount  = pullCount;
+        this.version    = version;
+        this.category   = category;
+        this.stable     = stable;
+        this.deprecated = deprecated;
     }
 
     public final String getName() {
@@ -43,7 +51,23 @@ public class ExternalApiImage {
         return version;
     }
 
+    public final String getCategory() {
+        return category;
+    }
+
     public final boolean isStable() {
         return stable;
     }
+
+    public final boolean isDeprecated() {
+        return deprecated;
+    }
+
+    public final void setTemplateSpec(final ApiTemplateHolder templateHolder) {
+        this.templateSpec = templateHolder;
+    }
+
+    public final ApiTemplateHolder getTemplateSpec() {
+        return templateSpec;
+    }
 }

src/main/java/io/linuxserver/fleet/v2/types/api/external/templates/ApiDeviceTemplate.java

@@ -0,0 +1,36 @@
+/*
+ * Copyright (c)  2021 LinuxServer.io
+ *
+ * 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/>.
+ */
+package io.linuxserver.fleet.v2.types.api.external.templates;
+
+public class ApiDeviceTemplate {
+
+    private final String device;
+    private final String description;
+
+    public ApiDeviceTemplate(final String device, final String description) {
+        this.device = device;
+        this.description = description;
+    }
+
+    public String getDevice() {
+        return device;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+}

src/main/java/io/linuxserver/fleet/v2/types/api/external/templates/ApiEnvTemplate.java

@@ -0,0 +1,42 @@
+/*
+ * Copyright (c)  2021 LinuxServer.io
+ *
+ * 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/>.
+ */
+package io.linuxserver.fleet.v2.types.api.external.templates;
+
+public class ApiEnvTemplate {
+
+    private final String name;
+    private final String exampleValue;
+    private final String description;
+
+    public ApiEnvTemplate(final String name, final String exampleValue, final String description) {
+        this.name = name;
+        this.exampleValue = exampleValue;
+        this.description = description;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public String getExampleValue() {
+        return exampleValue;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+}

src/main/java/io/linuxserver/fleet/v2/types/api/external/templates/ApiPortTemplate.java

@@ -0,0 +1,42 @@
+/*
+ * Copyright (c)  2021 LinuxServer.io
+ *
+ * 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/>.
+ */
+package io.linuxserver.fleet.v2.types.api.external.templates;
+
+public class ApiPortTemplate {
+
+    private final int    port;
+    private final String protocol;
+    private final String description;
+
+    public ApiPortTemplate(final int port, final String protocol, final String description) {
+        this.port = port;
+        this.protocol = protocol;
+        this.description = description;
+    }
+
+    public int getPort() {
+        return port;
+    }
+
+    public String getProtocol() {
+        return protocol;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+}

src/main/java/io/linuxserver/fleet/v2/types/api/external/templates/ApiTemplateHolder.java

@@ -0,0 +1,85 @@
+/*
+ * Copyright (c)  2021 LinuxServer.io
+ *
+ * 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/>.
+ */
+package io.linuxserver.fleet.v2.types.api.external.templates;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ApiTemplateHolder {
+
+    private final List<ApiPortTemplate>   ports                = new ArrayList<>();
+    private final List<ApiVolumeTemplate> volumes              = new ArrayList<>();
+    private final List<ApiEnvTemplate>    environmentVariables = new ArrayList<>();
+    private final List<ApiDeviceTemplate> devices              = new ArrayList<>();
+    private final List<String>            capabilities         = new ArrayList<>();
+
+    public boolean hostNetwork;
+    public boolean privileged;
+
+    public ApiTemplateHolder(final boolean hostNetwork, final boolean privileged) {
+        this.hostNetwork = hostNetwork;
+        this.privileged = privileged;
+    }
+
+    public final void addCapability(final String cap) {
+        capabilities.add(cap);
+    }
+
+    public final void addDevice(final ApiDeviceTemplate deviceTemplate) {
+        devices.add(deviceTemplate);
+    }
+
+    public final void addEnv(final ApiEnvTemplate envTemplate) {
+        environmentVariables.add(envTemplate);
+    }
+
+    public final void addPort(final ApiPortTemplate portTemplate) {
+        ports.add(portTemplate);
+    }
+
+    public final void addVolume(final ApiVolumeTemplate volumeTemplate) {
+        volumes.add(volumeTemplate);
+    }
+
+    public List<String> getCapabilities() {
+        return capabilities;
+    }
+
+    public List<ApiDeviceTemplate> getDevices() {
+        return devices;
+    }
+
+    public List<ApiEnvTemplate> getEnvironmentVariables() {
+        return environmentVariables;
+    }
+
+    public List<ApiPortTemplate> getPorts() {
+        return ports;
+    }
+
+    public List<ApiVolumeTemplate> getVolumes() {
+        return volumes;
+    }
+
+    public boolean isHostNetwork() {
+        return hostNetwork;
+    }
+
+    public boolean isPrivileged() {
+        return privileged;
+    }
+}

src/main/java/io/linuxserver/fleet/v2/types/api/external/templates/ApiVolumeTemplate.java

@@ -0,0 +1,42 @@
+/*
+ * Copyright (c)  2021 LinuxServer.io
+ *
+ * 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/>.
+ */
+package io.linuxserver.fleet.v2.types.api.external.templates;
+
+public class ApiVolumeTemplate {
+
+    private final String  containerPath;
+    private final boolean readonly;
+    private final String  description;
+
+    public ApiVolumeTemplate(final String containerPath, final boolean readonly, final String description) {
+        this.containerPath = containerPath;
+        this.readonly = readonly;
+        this.description = description;
+    }
+
+    public String getContainerPath() {
+        return containerPath;
+    }
+
+    public boolean isReadonly() {
+        return readonly;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+}

src/main/java/io/linuxserver/fleet/v2/types/docker/DockerTag.java

@@ -17,6 +17,9 @@
 
 package io.linuxserver.fleet.v2.types.docker;
 
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
@@ -55,4 +58,9 @@ public class DockerTag {
     public LocalDateTime getBuildDate() {
         return buildDate;
     }
+
+    @Override
+    public final String toString() {
+        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
 }

src/main/java/io/linuxserver/fleet/v2/types/docker/DockerTagManifestDigest.java

@@ -48,4 +48,8 @@ public class DockerTagManifestDigest {
         return archVariant;
     }
 
+    @Override
+    public final String toString() {
+        return architecture + "/" + archVariant + "[" + digest + "]";
+    }
 }

src/main/java/io/linuxserver/fleet/v2/types/internal/ImageTemplateRequest.java

@@ -95,20 +95,21 @@ public class ImageTemplateRequest extends AbstractParamRequest {
         return volumes;
     }
 
-    public final List<TemplateItem<Void>> getEnvironment() {
+    public final List<TemplateItem<String>> getEnvironment() {
 
         final List<String> envNames        = getParams("imageTemplateEnv");
         final List<String> envDescriptions = getParams("imageTemplateEnvDescription");
+        final List<String> envExamples     = getParams("imageTemplateEnvExample");
 
-        checkLists(envNames, envDescriptions);
+        checkLists(envNames, envDescriptions, envExamples);
 
-        final List<TemplateItem<Void>> env = new ArrayList<>();
+        final List<TemplateItem<String>> env = new ArrayList<>();
 
         if (null != envNames) {
 
             int i = 0;
             for (; i < envNames.size(); i++) {
-                env.add(new TemplateItem<>(envNames.get(i), getOrNull(envDescriptions.get(i)),null));
+                env.add(new TemplateItem<>(envNames.get(i), getOrNull(envDescriptions.get(i)), getOrNull(envExamples.get(i))));
             }
         }
 

src/main/java/io/linuxserver/fleet/v2/types/meta/template/EnvironmentTemplateItem.java

@@ -19,11 +19,18 @@ package io.linuxserver.fleet.v2.types.meta.template;
 
 public class EnvironmentTemplateItem extends AbstractTemplateItem<String, EnvironmentTemplateItem> {
 
-    public EnvironmentTemplateItem(final String name, final String description) {
+    private final String exampleValue;
+
+    public EnvironmentTemplateItem(final String name, final String description, final String exampleValue) {
         super(name, description);
+        this.exampleValue = exampleValue;
     }
 
     public final String getEnv() {
         return getName();
     }
+
+    public final String getExampleValue() {
+        return exampleValue;
+    }
 }

src/main/java/io/linuxserver/fleet/v2/web/routes/LegacyExternalApiController.java

@@ -23,7 +23,11 @@ import io.linuxserver.fleet.v2.service.AbstractAppService;
 import io.linuxserver.fleet.v2.types.Image;
 import io.linuxserver.fleet.v2.types.Repository;
 import io.linuxserver.fleet.v2.types.api.external.AllImagesExternalApiResponse;
+import io.linuxserver.fleet.v2.types.api.external.ExternalApiImage;
 import io.linuxserver.fleet.v2.types.api.external.ExternalApiResponse;
+import io.linuxserver.fleet.v2.types.api.external.templates.*;
+import io.linuxserver.fleet.v2.types.docker.DockerCapability;
+import io.linuxserver.fleet.v2.types.meta.template.*;
 import io.linuxserver.fleet.v2.web.ApiException;
 
 import java.util.List;
@@ -36,6 +40,8 @@ public class LegacyExternalApiController extends AbstractAppService {
 
     public final void fetchAllImages(final Context ctx) {
 
+        final boolean verboseOutput = ctx.queryParam("verbose", Boolean.class, "false").get();
+
         try {
 
             final AllImagesExternalApiResponse responseData = new AllImagesExternalApiResponse();
@@ -45,11 +51,16 @@ public class LegacyExternalApiController extends AbstractAppService {
 
                 for (Image image : repository.getImages()) {
 
-                    responseData.addImage(image.getRepositoryName(),
-                                          image.getName(),
-                                          image.getPullCount(),
-                                          image.getLatestTag().getVersion(),
-                                          image.isStable());
+                    final ExternalApiImage apiImage = responseData.addImage(image.getRepositoryName(),
+                                                                            image.getName(),
+                                                                            image.getPullCount(),
+                                                                            image.getLatestTag().getVersion(),
+                                                                            image.getMetaData().getCategory(),
+                                                                            image.isStable(),
+                                                                            image.isDeprecated());
+                    if (verboseOutput) {
+                        enrichImageWithTemplateData(apiImage, image.getMetaData().getTemplates());
+                    }
                 }
             }
 
@@ -59,4 +70,32 @@ public class LegacyExternalApiController extends AbstractAppService {
             throw new ApiException(e.getMessage(), e);
         }
     }
+
+    private void enrichImageWithTemplateData(final ExternalApiImage apiImage, final ImageTemplateHolder templateHolder) {
+
+        final ApiTemplateHolder apiTemplateHolder = new ApiTemplateHolder(templateHolder.isHostNetworkingEnabled(),
+                                                                          templateHolder.isPrivilegedMode());
+
+        for (PortTemplateItem port : templateHolder.getPorts()) {
+            apiTemplateHolder.addPort(new ApiPortTemplate(port.getPort(), port.getProtocol(), port.getDescription()));
+        }
+
+        for (VolumeTemplateItem volume : templateHolder.getVolumes()) {
+            apiTemplateHolder.addVolume(new ApiVolumeTemplate(volume.getVolume(), volume.isReadonly(), volume.getDescription()));
+        }
+
+        for (EnvironmentTemplateItem env : templateHolder.getEnv()) {
+            apiTemplateHolder.addEnv(new ApiEnvTemplate(env.getEnv(), env.getExampleValue(), env.getDescription()));
+        }
+
+        for (DeviceTemplateItem device : templateHolder.getDevices()) {
+            apiTemplateHolder.addDevice(new ApiDeviceTemplate(device.getDevice(), device.getDescription()));
+        }
+
+        for (DockerCapability capability : templateHolder.getCapabilities()) {
+            apiTemplateHolder.addCapability(capability.name());
+        }
+
+        apiImage.setTemplateSpec(apiTemplateHolder);
+    }
 }

src/main/resources/db/migration/V2.7__UpdateImageTemplateSprocs.sql

@@ -0,0 +1,110 @@
+DELIMITER //
+
+ALTER TABLE ImageTemplateEnvironment
+    ADD COLUMN `example` VARCHAR(255);
+//
+
+CREATE OR REPLACE PROCEDURE `Image_StoreTemplateEnv`
+(
+    in_image_id    INT,
+    in_env_key     VARCHAR(100),
+    in_env_desc    VARCHAR(255),
+    in_env_example VARCHAR(255)
+)
+BEGIN
+
+    IF EXISTS(SELECT 1 FROM `ImageTemplateEnvironment` WHERE `image_id` = in_image_id AND `env_key` = in_env_key) THEN
+
+        UPDATE `ImageTemplateEnvironment`
+        SET
+            `description` = in_env_desc,
+            `example`     = in_env_example
+        WHERE
+            `image_id` = in_image_id AND `env_key` = in_env_key;
+
+    ELSE
+
+        INSERT INTO `ImageTemplateEnvironment`
+        (
+            `image_id`,
+            `env_key`,
+            `description`,
+            `example`
+        )
+        VALUES
+        (
+            in_image_id,
+            in_env_key,
+            in_env_desc,
+            in_env_example
+        );
+
+    END IF;
+
+END //
+
+CREATE OR REPLACE PROCEDURE `Image_GetTemplates`
+(
+    in_image_id INT
+)
+BEGIN
+
+    SELECT
+        'Port'        AS `ItemType`,
+        `port`        AS `ItemName`,
+        `description` AS `ItemDescription`,
+        `protocol`    AS `ItemSecondary`
+    FROM
+        `ImageTemplatePorts`
+    WHERE
+            `image_id` = in_image_id
+
+    UNION ALL
+
+    SELECT
+        'Volume'      AS `ItemType`,
+        `volume`      AS `ItemName`,
+        `description` AS `ItemDescription`,
+        `read_only`   AS `ItemSecondary`
+    FROM
+        `ImageTemplateVolumes`
+    WHERE
+            `image_id` = in_image_id
+
+    UNION ALL
+
+    SELECT
+        'Env'         AS `ItemType`,
+        `env_key`     AS `ItemName`,
+        `description` AS `ItemDescription`,
+        `example`     AS `ItemSecondary`
+    FROM
+        `ImageTemplateEnvironment`
+    WHERE
+        `image_id` = in_image_id
+
+    UNION ALL
+
+    SELECT
+        'Device'      AS `ItemType`,
+        `device`      AS `ItemName`,
+        `description` AS `ItemDescription`,
+        NULL          AS `ItemSecondary`
+    FROM
+        `ImageTemplateDevices`
+    WHERE
+        `image_id` = in_image_id
+
+    UNION ALL
+
+    SELECT
+        'Extra'       AS `ItemType`,
+        `extra_key`   AS `ItemName`,
+        `description` AS `ItemDescription`,
+        NULL          AS `ItemSecondary`
+    FROM
+        `ImageTemplateExtra`
+    WHERE
+        `image_id` = in_image_id;
+
+END //

src/main/resources/db/migration/V2.8__FixStoreCoreMetaOutputBug.sql

@@ -0,0 +1,65 @@
+DELIMITER //
+
+CREATE OR REPLACE PROCEDURE Image_StoreCoreMetaData
+(
+    in_id           INT,
+    in_category     VARCHAR(255),
+    in_base_image   VARCHAR(255),
+    in_icon_url     VARCHAR(1000),
+
+    OUT out_status ENUM('Inserted', 'Updated', 'NoChange')
+)
+BEGIN
+
+    -- Only add core metadata if it has been provided with at least one value
+    IF
+        (
+                in_category   IS NOT NULL OR
+                in_base_image IS NOT NULL OR
+                in_icon_url   IS NOT NULL
+            )
+    THEN
+
+        IF NOT EXISTS(SELECT 1 FROM ImageMetadata WHERE `image_id` = in_id) THEN
+
+            INSERT INTO ImageMetadata
+            (
+                `image_id`,
+                `category`,
+                `base_image`,
+                `icon_url`
+            )
+            VALUES
+            (
+                in_id,
+                in_category,
+                in_base_image,
+                in_icon_url
+            );
+
+            SET out_status = 'Inserted';
+
+        ELSE
+
+            UPDATE ImageMetadata
+            SET
+                `category`   = in_category,
+                `base_image` = in_base_image,
+                `icon_url`   = in_icon_url
+            WHERE
+                    `image_id` = in_id;
+
+            IF ROW_COUNT() = 0 THEN
+                SET out_status = 'NoChange';
+            ELSE
+                SET out_status = 'Updated';
+            END IF;
+
+        END IF;
+
+    ELSE
+        SET out_status = 'NoChange';
+    END IF;
+
+END;
+//

src/main/resources/static/assets/js/admin.js

@@ -226,6 +226,9 @@ var Admin = (function($) {
                 '<td>' +
                     makeInput('imageTemplateEnv', 'text', true) +
                 '</td>' +
+                '<td>' +
+                    makeInput('imageTemplateEnvExample') +
+                '</td>' +
                 '<td>' +
                     makeInput('imageTemplateEnvDescription') +
                 '</td>' +

src/main/resources/version.properties

@@ -1,5 +1,5 @@
-#Tue Apr 28 20:35:17 BST 2020
-app.build.date=2020-04-28T20\:35\:17
-app.build.os=Linux
+#Sun Oct 30 08:13:05 GMT 2022
+app.build.date=2022-10-30T08\:13\:05
+app.build.os=Mac OS X
 app.build.user=josh
-app.version=2.0.4
+app.version=2.3.3

src/main/resources/views/pages/admin/template-components/image-template-environment.ftl

@@ -25,6 +25,7 @@
         <thead>
             <tr>
                 <th>Environment Variable</th>
+                <th>Example Value</th>
                 <th>Description</th>
                 <th></th>
             </tr>
@@ -36,7 +37,10 @@
                         <input title="Environment mapping" type="text" class="input is-small" value="${env.env}" name="imageTemplateEnv" required />
                     </td>
                     <td>
-                        <input title="Environment mapping description" type="text" class="input is-small" value="${env.description!""}" name="imageTemplateEnvDescription" required />
+                        <input title="Environment mapping example value" type="text" class="input is-small" value="${env.exampleValue!""}" name="imageTemplateEnvExample" />
+                    </td>
+                    <td>
+                        <input title="Environment mapping description" type="text" class="input is-small" value="${env.description!""}" name="imageTemplateEnvDescription" />
                     </td>
                     <td>
                         <@button.buttons isRightAligned=true>

src/main/resources/views/pages/image.ftl

@@ -116,12 +116,19 @@
                                     <tbody>
                                         <@table.halfDisplayRow title="Docker Hub"   value='<i class="fab fa-docker"></i> ${image.fullName}' link="https://hub.docker.com/r/${image.fullName}" />
                                         <@table.halfDisplayRow title="Build Time"   value=image.lastUpdatedAsString />
+
                                         <#if image.metaData.baseImage?has_content>
                                             <@table.halfDisplayRow title="Base Image" value=image.metaData.baseImage?html />
                                         </#if>
+
+                                        <#if image.metaData.category?has_content>
+                                            <@table.halfDisplayRow title="Category" value=image.metaData.category?html />
+                                        </#if>
+
                                         <@table.halfDisplayRow title="Synchronised" value=image.syncEnabled?string("Yes", "No") />
                                         <@table.halfDisplayRow title="Stable"       value=image.stable?string("Yes", "No") />
                                         <@table.halfDisplayRow title="Deprecated"   value=image.deprecated?string("Yes", "No") />
+
                                     </tbody>
                                 </@table.table>
 
@@ -141,10 +148,6 @@
                                         </thead>
                                         <tbody>
 
-                                            <#if image.metaData.category?has_content>
-                                                <@table.halfDisplayRow title="Category" value=image.metaData.category />
-                                            </#if>
-
                                             <#-- Any set external Urls -->
                                             <#list image.metaData.externalUrls as url>
 

src/main/resources/views/prebuilt/base.ftl

@@ -96,7 +96,7 @@
 
     <#nested>
 
-    <script type="text/javascript" src="/assets/js/jquery-3.3.1.min.js"></script>
+    <script type="text/javascript" src="/assets/js/jquery-3.5.1.min.js"></script>
     <script type="text/javascript" src="/assets/js/Chart.bundle.min.js"></script>
     <script type="text/javascript" src="/assets/js/jquery.tablesorter.js"></script>
     <script type="text/javascript" src="/assets/js/app.js"></script>

src/main/resources/views/prebuilt/docker-example.ftl

@@ -34,7 +34,7 @@ services:
 </#if>
 <#if templates.env?has_content>    environment:
   <#list templates.env as env>
-      - ${env.name}=<#if env.description?has_content> # ${env.description}</#if>
+      - ${env.name}<#if env.exampleValue?has_content>=${env.exampleValue}</#if><#if env.description?has_content> # ${env.description}</#if>
   </#list>
 </#if>
 <#if templates.volumes?has_content>    volumes:
@@ -63,7 +63,7 @@ services:
   --name=${containerName} \<#if templates.hostNetworkingEnabled>
   --net=host \</#if><#if templates.env?has_content>
 <#list templates.env as env>
-  -e ${env.name}=<#if env.description?has_content> `# ${env.description}`</#if> \
+  -e ${env.name}<#if env.exampleValue?has_content>=${env.exampleValue}</#if><#if env.description?has_content> `# ${env.description}`</#if> \
 </#list>
 </#if>
 <#if templates.volumes?has_content>

src/test/java/io/linuxserver/fleet/dockerhub/util/DockerTagFinderTest.java

@@ -0,0 +1,86 @@
+/*
+ * Copyright (c)  2020 LinuxServer.io
+ *
+ * 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/>.
+ */
+
+package io.linuxserver.fleet.dockerhub.util;
+
+import io.linuxserver.fleet.v2.types.docker.DockerTag;
+import io.linuxserver.fleet.v2.types.docker.DockerTagManifestDigest;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+
+public class DockerTagFinderTest {
+
+    @Test
+    public void shouldFindCorrectTagIfAllDigestsMatch() {
+
+        final DockerTag named = new DockerTag("latest", 1234L, LocalDateTime.now());
+        named.addDigest(new DockerTagManifestDigest(1234L, "digest1", "arch", "variant1"));
+        named.addDigest(new DockerTagManifestDigest(1234L, "digest2", "arch", "variant2"));
+        named.addDigest(new DockerTagManifestDigest(1234L, "digest3", "arch", "variant3"));
+
+        final DockerTag shouldMatch = new DockerTag("v1234", 1234L, LocalDateTime.now());
+        shouldMatch.addDigest(new DockerTagManifestDigest(1234L, "digest1", "arch", "variant1"));
+        shouldMatch.addDigest(new DockerTagManifestDigest(1234L, "digest2", "arch", "variant2"));
+        shouldMatch.addDigest(new DockerTagManifestDigest(1234L, "digest3", "arch", "variant3"));
+
+        final DockerTag shouldNotMatch = new DockerTag("v1234", 1234L, LocalDateTime.now());
+        shouldNotMatch.addDigest(new DockerTagManifestDigest(1234L, "digest1", "arch", "variant1"));
+        shouldNotMatch.addDigest(new DockerTagManifestDigest(1234L, "digest4", "arch", "variant2"));
+        shouldNotMatch.addDigest(new DockerTagManifestDigest(1234L, "digest3", "arch", "variant3"));
+
+        final List<DockerTag> tags = new ArrayList<>();
+        tags.add(named);
+        tags.add(shouldMatch);
+        tags.add(shouldNotMatch);
+
+        assertThat(DockerTagFinder.findVersionedTagMatchingBranch(tags, "latest"), is(equalTo(shouldMatch)));
+    }
+
+    @Test
+    public void shouldReturnFoundNamedTagIfNoOthersMatchFully() {
+
+        final DockerTag named = new DockerTag("latest", 1234L, LocalDateTime.now());
+        named.addDigest(new DockerTagManifestDigest(1234L, "digest1", "arch", "variant1"));
+        named.addDigest(new DockerTagManifestDigest(1234L, "digest2", "arch", "variant2"));
+        named.addDigest(new DockerTagManifestDigest(1234L, "digest3", "arch", "variant3"));
+
+        final DockerTag shouldMatch = new DockerTag("v1234", 1234L, LocalDateTime.now());
+        shouldMatch.addDigest(new DockerTagManifestDigest(1234L, "digest1", "arch", "variant1"));
+        shouldMatch.addDigest(new DockerTagManifestDigest(1234L, "digest5", "arch", "variant2"));
+        shouldMatch.addDigest(new DockerTagManifestDigest(1234L, "digest3", "arch", "variant3"));
+
+        final DockerTag shouldNotMatch = new DockerTag("v1234", 1234L, LocalDateTime.now());
+        shouldNotMatch.addDigest(new DockerTagManifestDigest(1234L, "digest1", "arch", "variant1"));
+        shouldNotMatch.addDigest(new DockerTagManifestDigest(1234L, "digest4", "arch", "variant2"));
+        shouldNotMatch.addDigest(new DockerTagManifestDigest(1234L, "digest3", "arch", "variant3"));
+
+        final List<DockerTag> tags = new ArrayList<>();
+        tags.add(named);
+        tags.add(shouldMatch);
+        tags.add(shouldNotMatch);
+
+        assertThat(DockerTagFinder.findVersionedTagMatchingBranch(tags, "latest"), is(equalTo(named)));
+    }
+}