Merge pull request #150 from jvlflame/dev

2.1.6
javinizer · Nov 16, 2020 · be30171 · be30171
2 parents f1f0422 + f61e467
commit be30171
Show file tree

Hide file tree

Showing 32 changed files with 2,961 additions and 2,102 deletions.
diff --git a/.github/CHANGELOG.md b/.github/CHANGELOG.md
@@ -5,6 +5,15 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [2.1.6]
+
+### Changed
+- Throttlelimit increased from 5 -> 10
+
+### Fixed
+- MediaInfo now functions correctly on linux
+
+
 ## [2.1.5]
 
 ### Changed

diff --git a/Dockerfile b/Dockerfile
@@ -1,13 +1,16 @@
 
 FROM ubuntu:18.04
+
+ADD docker-entrypoint.sh /home/
+RUN chmod +x /home/docker-entrypoint.sh
 RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections
 RUN apt-get update -y && apt-get install -y curl unrar wget software-properties-common apt-transport-https
 RUN add-apt-repository multiverse
 RUN mkdir /home/Universal
 WORKDIR /home/Universal
-RUN wget https://ftp.jeff-server.com/Universal.linux-x64.1.4.6.rar \
-    && unrar x Universal.linux-x64.1.4.6.rar \
-    && rm Universal.linux-x64.1.4.6.rar
+RUN wget https://ftp.jeff-server.com/Universal.linux-x64.1.4.9.rar \
+    && unrar x Universal.linux-x64.1.4.9.rar \
+    && rm Universal.linux-x64.1.4.9.rar
 RUN chmod +x /home/Universal/Universal.Server
 
 RUN wget -q https://packages.microsoft.com/config/ubuntu/18.04/packages-microsoft-prod.deb && dpkg -i packages-microsoft-prod.deb && apt-get update
@@ -23,11 +26,11 @@ RUN apt-get install -y git
 
 # Add custom UD components
 RUN pwsh -Command "Set-PSRepository -Name 'PSGallery' -InstallationPolicy Trusted"
-RUN pwsh -Command "Install-Module UniversalDashboard.Style; Install-Module UniversalDashboard.CodeEditor"
+RUN pwsh -Command "Install-Module UniversalDashboard.Style; Install-Module UniversalDashboard.UDPlayer; Install-Module UniversalDashboard.UDSpinner; Install-Module UniversalDashboard.UDScrollUp"
 
 # Clone dev Javinizer branch
 WORKDIR /home
-RUN git clone -b dev https://github.com/jvlflame/Javinizer.git
+RUN git clone https://github.com/jvlflame/Javinizer.git
 
 RUN wget https://ftp.jeff-server.com/UniversalDashboard.CodeEditor.rar \
     && unrar x UniversalDashboard.CodeEditor.rar \
@@ -39,4 +42,4 @@ ENV Data__RepositoryPath ./data/Repository
 ENV Data__ConnectionString ./data/database.db
 ENV UniversalDashboard__AssetsFolder ./data/UniversalDashboard
 ENV Logging__Path ./data/logs/log.txt
-ENTRYPOINT ["/home/Universal/Universal.Server"]
+ENTRYPOINT ["/home/docker-entrypoint.sh"]