Revert execstart change. Call dotnet with DLL argument.

immense · Apr 18, 2021 · ea520fa · ea520fa
1 parent c941828
commit ea520fa
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 5 deletions.
diff --git a/Server.Installer/Resources/CentOS_Caddy_Install.sh b/Server.Installer/Resources/CentOS_Caddy_Install.sh
@@ -76,7 +76,7 @@ Description=Remotely Server
 
 [Service]
 WorkingDirectory=$AppRoot
-ExecStart=$AppRoot/Remotely_Server
+ExecStart=/usr/bin/dotnet $AppRoot/Remotely_Server.dll
 Restart=always
 # Restart service after 10 seconds if the dotnet service crashes:
 RestartSec=10

diff --git a/Server.Installer/Resources/CentOS_Nginx_Install.sh b/Server.Installer/Resources/CentOS_Nginx_Install.sh
@@ -128,7 +128,7 @@ Description=Remotely Server
 
 [Service]
 WorkingDirectory=$AppRoot
-ExecStart=$AppRoot/Remotely_Server
+ExecStart=/usr/bin/dotnet $AppRoot/Remotely_Server.dll
 Restart=always
 # Restart service after 10 seconds if the dotnet service crashes:
 RestartSec=10

diff --git a/Server.Installer/Resources/Ubuntu_Caddy_Install.sh b/Server.Installer/Resources/Ubuntu_Caddy_Install.sh
@@ -77,7 +77,7 @@ Description=Remotely Server
 
 [Service]
 WorkingDirectory=$AppRoot
-ExecStart=$AppRoot/Remotely_Server
+ExecStart=/usr/bin/dotnet $AppRoot/Remotely_Server.dll
 Restart=always
 # Restart service after 10 seconds if the dotnet service crashes:
 RestartSec=10

diff --git a/Server.Installer/Resources/Ubuntu_Nginx_Install.sh b/Server.Installer/Resources/Ubuntu_Nginx_Install.sh
@@ -144,7 +144,7 @@ Description=Remotely Server
 
 [Service]
 WorkingDirectory=$AppRoot
-ExecStart=$AppRoot/Remotely_Server
+ExecStart=/usr/bin/dotnet $AppRoot/Remotely_Server.dll
 Restart=always
 # Restart service after 10 seconds if the dotnet service crashes:
 RestartSec=10

diff --git a/Server/Dockerfile b/Server/Dockerfile
@@ -16,6 +16,12 @@ RUN \
   acl \
   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
+
 RUN \
   mkdir -p /var/www/remotely && \
   mkdir /config && \
@@ -26,4 +32,4 @@ RUN \
   chown -R www-data:www-data /var/www/remotely
 
 WORKDIR /var/www/remotely
-ENTRYPOINT ["Remotely_Server"]
+ENTRYPOINT ["usr/bin/dotnet", "/var/www/remotely/Remotely_Server.dll"]