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
+sourceCompatibility = JavaVersion.VERSION_11
-targetCompatibility = 11
+targetCompatibility = JavaVersion.VERSION_11
 
 repositories {
     mavenCentral()
 }
 
-version = '2.1.1'
+version = '2.3.3'
-
-sourceSets {
-
-    main {
-
-        java {
-            srcDir 'src/main/java'
-        }
-    }
-
-    test {
-
-        java {
-            srcDir 'src/test/java'
-        }
-    }
-}
 
 dependencies {
 
     // Logging
-    runtime 'org.apache.logging.log4j:log4j-api:2.11.1'
+    implementation 'org.apache.logging.log4j:log4j-api:2.19.0'
-    runtime 'org.apache.logging.log4j:log4j-core:2.11.1'
+    implementation 'org.apache.logging.log4j:log4j-core:2.19.0'
-    compile 'org.apache.logging.log4j:log4j-slf4j-impl:2.11.1'
+    implementation 'org.apache.logging.log4j:log4j-slf4j-impl:2.19.0'
 
     // HTTP Framework
-    compile 'io.javalin:javalin:3.6.0'
+    implementation 'io.javalin:javalin:3.6.0'
-    compile 'org.freemarker:freemarker:2.3.28'
+    implementation 'org.freemarker:freemarker:2.3.31'
-    compile 'org.apache.httpcomponents:httpclient:4.5.7'
+    implementation 'org.apache.httpcomponents:httpclient:4.5.13'
 
     // JSON Mapping/Marshalling
-    compile 'com.fasterxml.jackson.core:jackson-databind:2.9.6'
+    implementation 'com.fasterxml.jackson.core:jackson-databind:2.9.6'
-    compile 'com.fasterxml.jackson.core:jackson-core:2.9.6'
+    implementation '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-annotations:2.9.6'
 
     // Database
-    compile 'com.zaxxer:HikariCP:3.3.1'
+    runtimeOnly    'org.mariadb.jdbc:mariadb-java-client:3.0.6'
-    compile 'org.mariadb.jdbc:mariadb-java-client:2.4.0'
+    implementation 'org.flywaydb:flyway-core:8.2.0'
-    compile 'org.flywaydb:flyway-core:6.1.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'
+    testImplementation 'junit:junit:4.11'
-    testCompile 'org.mockito:mockito-core:1.10.19'
+    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

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,7 +1,7 @@
-#!/usr/bin/env sh
+#!/bin/sh
 
 #
-# Copyright 2015 the original author or authors.
+# 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.
@@ -17,78 +17,113 @@
 #
 
 ##############################################################################
-##
+#
-##  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"
+app_path=$0
-# Need this for relative symlinks.
+
-while [ -h "$PRG" ] ; do
+# Need this for daisy-chained symlinks.
-    ls=`ls -ld "$PRG"`
+while
-    link=`expr "$ls" : '.*-> \(.*\)$'`
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
-    if expr "$link" : '/.*' > /dev/null; then
+    [ -h "$app_path" ]
-        PRG="$link"
+do
-    else
+    ls=$( ls -ld "$app_path" )
-        PRG=`dirname "$PRG"`"/$link"
+    link=${ls#*' -> '}
-    fi
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
 done
-SAVED="`pwd`"
+
-cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
 
 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='"-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
+case "$( uname )" in                #(
-  CYGWIN* )
+  CYGWIN* )         cygwin=true  ;; #(
-    cygwin=true
+  Darwin* )         darwin=true  ;; #(
-    ;;
+  MSYS* | MINGW* )  msys=true    ;; #(
-  Darwin* )
+  NONSTOP* )        nonstop=true ;;
-    darwin=true
-    ;;
-  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
@@ -97,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
@@ -105,79 +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
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
+    case $MAX_FD in #(
-    if [ $? -eq 0 ] ; then
+      max*)
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+        MAX_FD=$( ulimit -H -n ) ||
-            MAX_FD="$MAX_FD_LIMIT"
+            warn "Could not query maximum file descriptor limit"
-        fi
+    esac
-        ulimit -n $MAX_FD
+    case $MAX_FD in  #(
-        if [ $? -ne 0 ] ; then
+      '' | soft) :;; #(
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
+      *)
-        fi
+        ulimit -n "$MAX_FD" ||
-    else
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
-        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 or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; 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=`expr $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" ;;
     esac
 fi
 
-# Escape application args
+# Collect all arguments for the java command, stacking in reverse order:
-save () {
+#   * args from the command line
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+#   * the main class name
-    echo " "
+#   * -classpath
-}
+#   * -D...appname settings
-APP_ARGS=`save "$@"`
+#   * --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
+# For Cygwin or MSYS, switch paths to Windows format before running java
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    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

@@ -29,6 +29,9 @@ 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="-Xmx64m" "-Xms64m"
 
@@ -37,7 +40,7 @@ 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.
@@ -51,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%
@@ -61,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/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/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,
+    public final ExternalApiImage addImage(final String repositoryName,
-                               final String imageName,
+                                           final String imageName,
-                               final long pullCount,
+                                           final long pullCount,
-                               final String version,
+                                           final String version,
-                               final boolean stable) {
+                                           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 final String  name;
-    private long    pullCount;
+    private final long    pullCount;
-    private String  version;
+    private final String  version;
-    private boolean stable;
+    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) {
+    private ApiTemplateHolder templateSpec;
-        this.name      = name;
+
-        this.pullCount = pullCount;
+    public ExternalApiImage(final String name, final long pullCount, final String version, final String category, final boolean stable, final boolean deprecated) {
-        this.version   = version;
+        this.name       = name;
-        this.stable    = stable;
+        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/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(),
+                    final ExternalApiImage apiImage = responseData.addImage(image.getRepositoryName(),
-                                          image.getName(),
+                                                                            image.getName(),
-                                          image.getPullCount(),
+                                                                            image.getPullCount(),
-                                          image.getLatestTag().getVersion(),
+                                                                            image.getLatestTag().getVersion(),
-                                          image.isStable());
+                                                                            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/version.properties

@@ -1,5 +1,5 @@
-#Sat Feb 13 14:18:23 GMT 2021
+#Sun Oct 30 08:13:05 GMT 2022
-app.build.date=2021-02-13T14\:18\:23
+app.build.date=2022-10-30T08\:13\:05
-app.build.os=Windows 10
+app.build.os=Mac OS X
-app.build.user=jagfi
+app.build.user=josh
-app.version=2.2.0
+app.version=2.3.3