Merge pull request #205 from JasonHHouse/issue/204

Issue/204
JasonHHouse · Jan 5, 2021 · 90ef76b · 90ef76b
2 parents 545334c + f60f9dd
commit 90ef76b
Show file tree

Hide file tree

Showing 27 changed files with 54 additions and 49,336 deletions.
diff --git a/Core/pom.xml b/Core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>Gaps</artifactId>
         <groupId>com.jasonhhouse</groupId>
-        <version>0.8.6</version>
+        <version>0.8.7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -15,7 +15,7 @@
         <dependency>
             <groupId>com.jasonhhouse</groupId>
             <artifactId>Plex</artifactId>
-            <version>0.8.6</version>
+            <version>0.8.7</version>
         </dependency>
 
         <dependency>

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM adoptopenjdk/openjdk11-openj9:jre-11.0.8_10_openj9-0.21.0
+FROM adoptopenjdk/openjdk11-openj9:jre-11.0.9_11_openj9-0.23.0
 
 LABEL maintainer="[email protected]"
 LABEL name="Jason House" 
@@ -24,7 +24,7 @@ RUN mkdir -p /usr/app && chmod 777 /usr/data
 
 WORKDIR /usr/app
 
-COPY GapsWeb/target/GapsWeb-0.8.6.jar /usr/app/gaps.jar
+COPY GapsWeb/target/GapsWeb-0.8.7.jar /usr/app/gaps.jar
 
 COPY start.sh /usr/app/
 

diff --git a/Dockerfile.arm64 b/Dockerfile.arm64
@@ -26,7 +26,7 @@ RUN mkdir -p /usr/app && chmod 777 /usr/data
 
 WORKDIR /usr/app
 
-COPY GapsWeb/target/GapsWeb-0.8.6.jar /usr/app/gaps.jar
+COPY GapsWeb/target/GapsWeb-0.8.7.jar /usr/app/gaps.jar
 
 COPY start.sh /usr/app/
 

diff --git a/Dockerfile.dev b/Dockerfile.dev
@@ -1,4 +1,4 @@
-FROM adoptopenjdk/openjdk11-openj9:jre-11.0.8_10_openj9-0.21.0
+FROM adoptopenjdk/openjdk11-openj9:jre-11.0.9_11_openj9-0.23.0
 
 ## Build image with sensible default environment values ##
 ENV gapsVersion=*

diff --git a/Dockerfile.ppc64le b/Dockerfile.ppc64le
@@ -1,4 +1,4 @@
-FROM ppc64le/openjdk:11.0.3-jre
+FROM adoptopenjdk/openjdk11-openj9:ppc64le-tumbleweed-jre-11.0.9_11_openj9-0.23.0
 
 LABEL maintainer="[email protected]"
 LABEL name="Jason House" 
@@ -22,7 +22,7 @@ RUN mkdir -p /usr/app && chmod 777 /usr/data
 
 WORKDIR /usr/app
 
-COPY GapsWeb/target/GapsWeb-0.8.6.jar /usr/app/gaps.jar
+COPY GapsWeb/target/GapsWeb-0.8.7.jar /usr/app/gaps.jar
 
 COPY start.sh /usr/app/
 

diff --git a/Dockerfile.raspbian b/Dockerfile.raspbian
@@ -1,4 +1,4 @@
-FROM bellsoft/liberica-openjdk-alpine:11.0.7
+FROM bellsoft/liberica-openjdk-alpine:11.0.9
 
 LABEL maintainer="[email protected]"
 LABEL name="Jason House" 
@@ -20,7 +20,7 @@ RUN mkdir -p /usr/app && chmod 777 /usr/data
 
 WORKDIR /usr/app
 
-COPY GapsWeb/target/GapsWeb-0.8.6.jar /usr/app/gaps.jar
+COPY GapsWeb/target/GapsWeb-0.8.7.jar /usr/app/gaps.jar
 
 COPY start.sh /usr/app/
 

diff --git a/Dockerfile.riscv64 b/Dockerfile.riscv64
@@ -24,7 +24,7 @@ RUN mkdir -p /usr/app && chmod 777 /usr/data
 
 WORKDIR /usr/app
 
-COPY GapsWeb/target/GapsWeb-0.8.6.jar /usr/app/gaps.jar
+COPY GapsWeb/target/GapsWeb-0.8.7.jar /usr/app/gaps.jar
 
 COPY start.sh /usr/app/
 

diff --git a/GapsAsJar/gaps.nsi b/GapsAsJar/gaps.nsi
@@ -48,4 +48,4 @@ RMDIR /r $INSTDIR
 SectionEnd
 
 # name the installer
-OutFile "gaps-0.8.6-installer.exe"
+OutFile "gaps-0.8.7-installer.exe"
diff --git a/GapsWeb/pom.xml b/GapsWeb/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>Gaps</artifactId>
         <groupId>com.jasonhhouse</groupId>
-        <version>0.8.6</version>
+        <version>0.8.7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -21,19 +21,19 @@
         <dependency>
             <groupId>com.jasonhhouse</groupId>
             <artifactId>Core</artifactId>
-            <version>0.8.6</version>
+            <version>0.8.7</version>
         </dependency>
 
         <dependency>
             <groupId>com.jasonhhouse</groupId>
             <artifactId>Plex</artifactId>
-            <version>0.8.6</version>
+            <version>0.8.7</version>
         </dependency>
 
         <dependency>
             <groupId>com.jasonhhouse</groupId>
             <artifactId>RadarrV3</artifactId>
-            <version>0.8.6</version>
+            <version>0.8.7</version>
         </dependency>
 
         <dependency>

diff --git a/GapsWeb/src/main/resources/application.yaml b/GapsWeb/src/main/resources/application.yaml
@@ -47,7 +47,7 @@ info:
   app:
     name: Gaps
     description: Gaps searches through your Plex Server or local folders for all movies, then queries for known movies in the same collection. If those movies don't exist in your library, Gaps will recommend getting those movies, legally of course.
-    version: 0.8.6
+    version: 0.8.7
     storageFolder: /usr/data
     properties:
       rssFeed: rssFeed.json

diff --git a/GapsWeb/src/main/resources/templates/about.html b/GapsWeb/src/main/resources/templates/about.html
@@ -78,7 +78,7 @@
     <img src="/images/final-2.svg" alt="Gaps Logo" style="width:50%;height:50%;" class="center">
 
     <h3 class="top-margin">About</h3>
-    <h4 class="top-margin text-primary">v0.8.6</h4>
+    <h4 class="top-margin text-primary">v0.8.7</h4>
 
     <p class="text-muted">Gaps searches through your Plex Server. It then queries
         for known

diff --git a/GapsWeb/src/main/resources/templates/index.html b/GapsWeb/src/main/resources/templates/index.html
@@ -77,7 +77,7 @@
 <div class="container bottom-margin">
     <img src="/images/final-2.svg" alt="Gaps Logo" style="width:50%;height:50%;" class="center">
 
-    <h3 class="top-margin">v0.8.6</h3>
+    <h3 class="top-margin">v0.8.7</h3>
 
     <p class="text-muted">Gaps searches through your Plex Server. It then queries
         for known

diff --git a/GapsWeb/src/main/resources/templates/updates.html b/GapsWeb/src/main/resources/templates/updates.html
@@ -78,6 +78,11 @@
     <img src="/images/final-2.svg" alt="Gaps Logo" style="width:50%;height:50%;" class="center">
 
     <h3 class="top-margin">Updates</h3>
+    <h4 class="top-margin text-primary">v0.8.7</h4>
+    <ul class="text-muted">
+        <li>Fixing Docker exposed ports for reverse proxies.</li>
+    </ul>
+
     <h4 class="top-margin text-primary">v0.8.6</h4>
     <ul class="text-muted">
         <li>Removed hardcoded test data for others to contribute easier.</li>

diff --git a/Plex/pom.xml b/Plex/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>Gaps</artifactId>
         <groupId>com.jasonhhouse</groupId>
-        <version>0.8.6</version>
+        <version>0.8.7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/RadarrV3/pom.xml b/RadarrV3/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>Gaps</artifactId>
         <groupId>com.jasonhhouse</groupId>
-        <version>0.8.6</version>
+        <version>0.8.7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/application-custom.yml b/application-custom.yml
@@ -44,7 +44,7 @@ info:
   app:
     name: Gaps
     description: Gaps searches through your Plex Server or local folders for all movies, then queries for known movies in the same collection. If those movies don't exist in your library, Gaps will recommend getting those movies, legally of course.
-    version: 0.8.6
+    version: 0.8.7
     storageFolder: /{CUSTOM_FOLDER} #Change to folder that gaps has permission to read, write, and delete in.
     properties:
       rssFeed: rssFeed.json

diff --git a/build b/build
@@ -1,6 +1,6 @@
 #!/bin/bash
 set -e
-VERSION=0.8.6
+VERSION=0.8.7
 JAR_VERSION="GapsWeb/target/GapsWeb-$VERSION.jar"
 ZIP_VERSION="GapsAsJar-$VERSION.zip"
 npm ci

diff --git a/build.bat b/build.bat
@@ -7,7 +7,7 @@ call npm run uglifyjs-pages
 call mvn clean install
 del GapsOnWindows\*.jar
 del GapsOnWindows\README.md
-copy GapsWeb\target\GapsWeb-0.8.6.jar GapsOnWindows\gaps.jar
+copy GapsWeb\target\GapsWeb-0.8.7.jar GapsOnWindows\gaps.jar
 copy README.md GapsOnWindows\
 cd GapsOnWindows
 makensis gaps.nsi
diff --git a/cypress/fixtures/gaps.properties.json b/cypress/fixtures/gaps.properties.json