Update ASP.NET Core version in install scripts/services. Update GitHu…

…b URLs. Update Docker Ubuntu image to Jammy.
immense · Sep 16, 2022 · eae16cb · eae16cb
1 parent 56cde30
commit eae16cb
Show file tree

Hide file tree

Showing 11 changed files with 45 additions and 45 deletions.
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 A remote control and remote scripting solution, built with .NET 6, Blazor, SignalR Core, and WebRTC.
 
 [![Build Status](https://dev.azure.com/translucency/Remotely/_apis/build/status/Remotely-ReleaseBuild?branchName=master)](https://dev.azure.com/translucency/Remotely/_build/latest?definitionId=17&branchName=master)
-![GitHub Build](https://github.com/lucent-sea/Remotely/workflows/GitHub%20Build/badge.svg)
+![GitHub Build](https://github.com/immense/Remotely/workflows/GitHub%20Build/badge.svg)
 
 
 # Status 

diff --git a/Server.Installer/Resources/CentOS_Caddy_Install.sh b/Server.Installer/Resources/CentOS_Caddy_Install.sh
@@ -40,7 +40,7 @@ sudo rpm -Uvh https://packages.microsoft.com/config/centos/7/packages-microsoft-
 
 yum -y install apt-transport-https
 yum -y update
-yum -y install aspnetcore-runtime-5.0
+yum -y install aspnetcore-runtime-6.0
 
 
  # Install other prerequisites.

diff --git a/Server.Installer/Resources/CentOS_Nginx_Install.sh b/Server.Installer/Resources/CentOS_Nginx_Install.sh
@@ -37,7 +37,7 @@ sudo rpm -Uvh https://packages.microsoft.com/config/centos/7/packages-microsoft-
 
 yum -y install apt-transport-https
 yum -y update
-yum -y install aspnetcore-runtime-5.0
+yum -y install aspnetcore-runtime-6.0
 
 
  # Install other prerequisites.

diff --git a/Server.Installer/Resources/Ubuntu_Caddy_Install.sh b/Server.Installer/Resources/Ubuntu_Caddy_Install.sh
@@ -29,33 +29,33 @@ chmod +x "$AppRoot/Remotely_Server"
 
 echo "Using $AppRoot as the Remotely website's content directory."
 
-UbuntuVersion=$(lsb_release -r -s)
-
 apt-get -y install curl
 apt-get -y install software-properties-common
 apt-get -y install gnupg
 
+UbuntuVersion=$(lsb_release -r -s)
+UbuntuVersionInt=$(("${UbuntuVersion/./}"))
+
 # Install .NET Core Runtime.
-wget -q https://packages.microsoft.com/config/ubuntu/$UbuntuVersion/packages-microsoft-prod.deb
-dpkg -i packages-microsoft-prod.deb
-add-apt-repository universe
-apt-get update
-apt-get -y install apt-transport-https
-apt-get -y install aspnetcore-runtime-5.0
-rm packages-microsoft-prod.deb
+if [ $UbuntuVersionInt -ge 2204 ]; then
+    apt-get install -y aspnetcore-runtime-6.0
+else
+    wget -q https://packages.microsoft.com/config/ubuntu/$UbuntuVersion/packages-microsoft-prod.deb
+    dpkg -i packages-microsoft-prod.deb
+    add-apt-repository universe
+    apt-get update
+    apt-get -y install apt-transport-https
+    apt-get -y install aspnetcore-runtime-6.0
+    rm packages-microsoft-prod.deb
+fi
 
 
- # Install other prerequisites.
-apt-get -y install unzip
-apt-get -y install acl
-apt-get -y install libc6-dev
-apt-get -y install libgdiplus
 
 
 # Install Caddy
 apt install -y debian-keyring debian-archive-keyring apt-transport-https
-curl -1sLf 'https://dl.cloudsmith.io/public/caddy/stable/gpg.key' | sudo apt-key add -
-curl -1sLf 'https://dl.cloudsmith.io/public/caddy/stable/debian.deb.txt' | sudo tee -a /etc/apt/sources.list.d/caddy-stable.list
+curl -1sLf 'https://dl.cloudsmith.io/public/caddy/stable/gpg.key' | gpg --dearmor -o /usr/share/keyrings/caddy-stable-archive-keyring.gpg
+curl -1sLf 'https://dl.cloudsmith.io/public/caddy/stable/debian.deb.txt' | tee /etc/apt/sources.list.d/caddy-stable.list
 apt update
 apt install caddy
 

diff --git a/Server.Installer/Resources/Ubuntu_Nginx_Install.sh b/Server.Installer/Resources/Ubuntu_Nginx_Install.sh
@@ -29,20 +29,26 @@ chmod +x "$AppRoot/Remotely_Server"
 
 echo "Using $AppRoot as the Remotely website's content directory."
 
-UbuntuVersion=$(lsb_release -r -s)
-
 apt-get -y install curl
 apt-get -y install software-properties-common
 apt-get -y install gnupg
 
+UbuntuVersion=$(lsb_release -r -s)
+UbuntuVersionInt=$(("${UbuntuVersion/./}"))
+
 # Install .NET Core Runtime.
-wget -q https://packages.microsoft.com/config/ubuntu/$UbuntuVersion/packages-microsoft-prod.deb
-dpkg -i packages-microsoft-prod.deb
-add-apt-repository universe
-apt-get update
-apt-get -y install apt-transport-https
-apt-get -y install aspnetcore-runtime-5.0
-rm packages-microsoft-prod.deb
+if [ $UbuntuVersionInt -ge 2204 ]; then
+    apt-get install -y aspnetcore-runtime-6.0
+else
+    wget -q https://packages.microsoft.com/config/ubuntu/$UbuntuVersion/packages-microsoft-prod.deb
+    dpkg -i packages-microsoft-prod.deb
+    add-apt-repository universe
+    apt-get update
+    apt-get -y install apt-transport-https
+    apt-get -y install aspnetcore-runtime-6.0
+    rm packages-microsoft-prod.deb
+fi
+
 
 
  # Install other prerequisites.

diff --git a/Server.Installer/Services/GitHubApi.cs b/Server.Installer/Services/GitHubApi.cs
@@ -113,7 +113,7 @@ public async Task<string> GetLatestReleaseTag()
         {
             try
             {
-                var response = await _httpClient.GetFromJsonAsync<GitHubReleasesResponsePayload>("https://api.github.com/repos/lucent-sea/Remotely/releases/latest");
+                var response = await _httpClient.GetFromJsonAsync<GitHubReleasesResponsePayload>("https://api.github.com/repos/immense/Remotely/releases/latest");
                 return response.tag_name;
             }
             catch (Exception ex)

diff --git a/Server.Installer/Services/ServerInstaller.cs b/Server.Installer/Services/ServerInstaller.cs
@@ -38,8 +38,8 @@ public async Task PerformInstall(CliParams cliParams)
                 ConsoleHelper.WriteLine("Downloading pre-built server package.");
 
                 var releaseFile = cliParams.WebServer == WebServerType.IisWindows ?
-                    "https://github.com/lucent-sea/Remotely/releases/latest/download/Remotely_Server_Win-x64.zip" :
-                    "https://github.com/lucent-sea/Remotely/releases/latest/download/Remotely_Server_Linux-x64.zip";
+                    "https://github.com/immense/Remotely/releases/latest/download/Remotely_Server_Win-x64.zip" :
+                    "https://github.com/immense/Remotely/releases/latest/download/Remotely_Server_Linux-x64.zip";
 
                 using var httpClient = new HttpClient();
                 var response = await httpClient.GetAsync(releaseFile);

diff --git a/Server/Dockerfile b/Server/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:focal
+FROM ubuntu:jammy
 
 EXPOSE 5000
 
@@ -16,15 +16,12 @@ RUN \
   libssl1.0
 
 RUN \
-  wget -q https://packages.microsoft.com/config/ubuntu/20.04/packages-microsoft-prod.deb && \
-  dpkg -i packages-microsoft-prod.deb && \
-  apt-get -y update && \
-  apt-get -y install aspnetcore-runtime-5.0
+  apt-get -y install aspnetcore-runtime-6.0
 
 RUN \
   mkdir -p /var/www/remotely && \
   mkdir /config && \
-  wget -q https://github.com/lucent-sea/Remotely/releases/latest/download/Remotely_Server_Linux-x64.zip && \
+  wget -q https://github.com/immense/Remotely/releases/latest/download/Remotely_Server_Linux-x64.zip && \
   unzip -o Remotely_Server_Linux-x64.zip -d /var/www/remotely && \
   rm Remotely_Server_Linux-x64.zip
 

diff --git a/Server/Dockerfile-rootless b/Server/Dockerfile-rootless
@@ -1,4 +1,4 @@
-FROM ubuntu:focal
+FROM ubuntu:jammy
 
 EXPOSE 5000
 
@@ -16,16 +16,13 @@ RUN \
   libssl1.0
 
 RUN \
-  wget -q https://packages.microsoft.com/config/ubuntu/20.04/packages-microsoft-prod.deb && \
-  dpkg -i packages-microsoft-prod.deb && \
-  apt-get -y update && \
-  apt-get -y install aspnetcore-runtime-5.0
+  apt-get -y install aspnetcore-runtime-6.0
 
 RUN \
   adduser --disabled-password --gecos '' -u 2001 remotely && \
   mkdir -p /var/www/remotely && \
   mkdir /config && \
-  wget -q https://github.com/lucent-sea/Remotely/releases/latest/download/Remotely_Server_Linux-x64.zip && \
+  wget -q https://github.com/immense/Remotely/releases/latest/download/Remotely_Server_Linux-x64.zip && \
   unzip -o Remotely_Server_Linux-x64.zip -d /var/www/remotely && \
   rm Remotely_Server_Linux-x64.zip && \
   chown -R remotely:remotely /var/www/remotely

diff --git a/Server/Pages/RemoteControl.cshtml b/Server/Pages/RemoteControl.cshtml
@@ -249,7 +249,7 @@
 
     <footer>
         <div class="footer-wrapper">
-            &copy; 2021 - <a href="https://lucency.co">Translucency Software</a>
+            &copy; @(DateTime.Now.Year) - Immense Networks
         </div>
     </footer>
 

diff --git a/Server/Services/UpgradeService.cs b/Server/Services/UpgradeService.cs
@@ -32,7 +32,7 @@ public async Task<bool> IsNewVersionAvailable()
             try
             {
                 using var client = _httpClientFactory.CreateClient();
-                var response = await client.GetAsync("https://github.com/lucent-sea/Remotely/releases/latest");
+                var response = await client.GetAsync("https://github.com/immense/Remotely/releases/latest");
                 var versionString = response.RequestMessage.RequestUri.ToString().Split("/").Last()[1..];
                 var remoteVersion = Version.Parse(versionString);
                 var filePath = Directory.GetFiles(Directory.GetCurrentDirectory(), "Remotely_Server.dll", SearchOption.AllDirectories).First();