Update Dockerfile

Author: gentslava

Dockerfile

@@ -1,5 +1,7 @@
+ARG DOTNET_VERSION=9.0
+
 # ### BUILD MAIN IMAGE START ###
-FROM ubuntu
+FROM mcr.microsoft.com/dotnet/sdk:${DOTNET_VERSION}
 
 ENV JACRED_HOME=/home/jacred
 ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false
@@ -9,9 +11,12 @@ COPY ./privoxy.config /etc/privoxy/config
 
 COPY ./install.sh /
 COPY ./update.sh /
+COPY ./entrypoint.sh /
 
 RUN sh /install.sh
 
+RUN chmod +x /entrypoint.sh
+
 WORKDIR /home/jacred
 
 RUN crontab Data/crontab

entrypoint.sh

@@ -1,9 +1,11 @@
 #!/bin/sh
-systemctl start tor
 systemctl enable tor
-systemctl start privoxy
+systemctl start tor
+
 systemctl enable privoxy
+systemctl start privoxy
 
-dotnet JacRed.dll || exit 1
+systemctl enable jacred
+systemctl start jacred
 
 crond -f -l 8

install.sh

@@ -5,11 +5,6 @@ DEST="/home/jacred"
 # sudo su -
 apt update && apt install -y wget unzip
 
-# Install .NET
-wget https://dot.net/v1/dotnet-install.sh -O dotnet-install.sh && chmod 755 dotnet-install.sh
-./dotnet-install.sh --channel 9.0 --install-dir /usr/share/dotnet
-ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet
-
 # Download zip
 mkdir $DEST -p && cd $DEST
 wget https://github.com/immisterio/jacred-fdb/releases/latest/download/publish.zip