changed to current wait for in docker and implemented healthchecks

Author: Apfelwurm

.env.example

@@ -1,8 +1,8 @@
+APPPort=5000
 DBProvider=psql
 DBName=NETEVENT
 DBServer=netevent_psql
 DBPort=5432
 DBUser=NETEVENTDBUSER
 DBPassword=NETEVENTDBPASSWORD
-TZ=Europe/Berlin
-ASPNETCORE_URLS=http://+:5000
+TZ=Europe/Berlin

Dockerfile

@@ -13,9 +13,13 @@ RUN apt-get update -qqy && DEBIAN_FRONTEND=noninteractive apt-get install -y \
 RUN wget https://packages.microsoft.com/config/debian/11/packages-microsoft-prod.deb -O packages-microsoft-prod.deb
 RUN dpkg -i packages-microsoft-prod.deb
 RUN rm packages-microsoft-prod.deb
-RUN apt-get update -qqy && apt-get install -y dotnet-sdk-6.0
+RUN apt-get update -qqy && apt-get install -y dotnet-sdk-6.0 python3 python3-pip wget
+RUN pip install lastversion
 RUN eval apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
+#get wait-for
+RUN wget -q $(lastversion https://github.com/eficode/wait-for --format assets)
+
 #get NetEvent and publish it
 COPY NetEvent /NetEvent
 WORKDIR /NetEvent
@@ -47,7 +51,7 @@ VOLUME [ "/data" ]
 
 #container scripts
 COPY docker/start-container /usr/local/bin/start-container
-COPY docker/wait-for.sh /usr/local/bin/wait-for.sh
+COPY --from=build /wait-for /usr/local/bin/wait-for.sh
 RUN chmod +x /usr/local/bin/start-container
 RUN chmod +x /usr/local/bin/wait-for.sh
 
@@ -57,7 +61,7 @@ RUN apt-get update -qqy && DEBIAN_FRONTEND=noninteractive apt-get install -y \
 RUN wget https://packages.microsoft.com/config/debian/11/packages-microsoft-prod.deb -O packages-microsoft-prod.deb
 RUN dpkg -i packages-microsoft-prod.deb
 RUN rm packages-microsoft-prod.deb
-RUN apt-get update -qqy && apt-get install -y aspnetcore-runtime-6.0
+RUN apt-get update -qqy && apt-get install -y aspnetcore-runtime-6.0 netcat curl
 RUN eval apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
 #copy NetEvent files
@@ -83,4 +87,5 @@ USER NetEvent
 
 # run
 WORKDIR /NetEvent
-CMD [ "/bin/sh", "-c", "start-container" ]
+CMD [ "/bin/sh", "-c", "start-container" ]
+HEALTHCHECK --retries=3 --timeout=10s CMD curl --fail http://localhost:5000/healthcheck || exit

NetEvent/Server/Program.cs

@@ -53,6 +53,8 @@
 builder.Services.AddEndpointsApiExplorer();
 builder.Services.AddSwaggerGen();
 
+builder.Services.AddHealthChecks();
+
 var app = builder.Build();
 
 using (IServiceScope scope = app.Services.CreateScope())
@@ -72,6 +74,7 @@
 }
 else
 {
+    app.UseHealthChecks("/healthcheck");
     app.UseExceptionHandler("/Error");
     app.UseHsts();
 }

docker-compose.yml

@@ -3,10 +3,9 @@ services:
     netevent:
         image: lan2play/netevent
         ports:
-            - '5000:5000/tcp'
+            - '${APPPort:-5000}:5000'
         env_file: .env
         environment:
-            ASPNETCORE_URLS: '${ASPNETCORE_URLS}'
             DBProvider: "${DBProvider}"
             DBName: "${DBName}"
             DBServer: "${DBServer}"
@@ -20,6 +19,10 @@ services:
             - netevent
         depends_on:
             - netevent_psql
+        healthcheck:
+          test: ["CMD-SHELL", "curl --fail http://localhost:5000/healthcheck || exit"]
+          retries: 3
+          timeout: 10s
 
     netevent_psql:
         image: 'postgres:latest'
@@ -34,9 +37,9 @@ services:
         networks:
             - netevent
         healthcheck:
-          test: ["CMD-SHELL", "pg_isready -U postgres"]
+          test: ["CMD-SHELL", "pg_isready -U ${DBUser} -d ${DBName}"]
           retries: 3
-          timeout: 5s
+          timeout: 10s
 
 networks:
     netevent:

docker/start-container

@@ -7,7 +7,7 @@ then
     # Database Wait check
     echo "---------------"
     echo "WAITING FOR $DBServer:$DBPort..."
-    wait-for.sh $DBServer:$DBPort --timeout=30 --strict -- /NetEvent/NetEvent.Server
+    wait-for.sh $DBServer:$DBPort --timeout=30 -- /NetEvent/NetEvent.Server
 fi
 if [[ "$DBProvider" = "sqlite" ]]
 then