diff --git a/Dockerfile b/Dockerfile index 29472f6..523e1ee 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,6 +4,9 @@ WORKDIR /app EXPOSE 5047 EXPOSE 7221 +# Install curl in the final runtime image +RUN apt-get update && apt-get install -y curl && rm -rf /var/lib/apt/lists/* + FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:9.0 AS build ARG TARGETARCH WORKDIR /src @@ -23,6 +26,9 @@ RUN dotnet publish "./iGotify Notification Assist.csproj" -c Release -a $TARGETA # final stage/image FROM base AS final WORKDIR /app + +# Copy build output COPY --from=publish /app/publish . + # USER $APP_UID ENTRYPOINT ["dotnet", "iGotify Notification Assist.dll"] diff --git a/README.md b/README.md index 0806772..1bb94a8 100644 --- a/README.md +++ b/README.md @@ -40,6 +40,9 @@ Download Link to iGotify down below * `GOTIFY_URLS` = the local gotify sever URL e.g.: `http://gotify` * `GOTIFY_CLIENT_TOKENS` = the client token from the Gotify Client e.g.: `cXXXXXXXX` * `SECNTFY_TOKENS` = the SecNtfy Token that you get from the app after configure it e.g.: `NTFY-DEVICE-XXXXXX` + +*These three environment variables above aren't required when the Gotify & iGotify Instances available over a domain!* + * `ENABLE_CONSOLE_LOG` = you can disable unnecessary console logs (default: true) * `ENABLE_SCALAR_UI` = you can now disable the Endpoint page (default: true) @@ -55,8 +58,6 @@ Download Link to iGotify down below   ```bash -version: '3.8' - services: gotify: container_name: gotify @@ -82,6 +83,11 @@ services: security_opt: - no-new-privileges:true pull_policy: always + healthcheck: + test: [ "CMD", "curl", "-f", "http://localhost:8080/Version" ] + interval: "3s" + timeout: "3s" + retries: 5 networks: - net ports: @@ -122,8 +128,6 @@ Also **don't** check the boxes which say "HTTP/2 Support" and "HSTS enabled". ### Traefik Config ```bash -version: "3.8" - services: gotify: container_name: gotify @@ -152,8 +156,6 @@ services: networks: default: null proxy: null - volumes: - - data:/app/data igotify-notification: # (iGotify-Notification-Assistent) container_name: igotify @@ -163,6 +165,11 @@ services: security_opt: - no-new-privileges:true pull_policy: always + healthcheck: + test: [ "CMD", "curl", "-f", "http://localhost:8080/Version" ] + interval: "3s" + timeout: "3s" + retries: 5 volumes: - api-data:/app/data diff --git a/docker-compose.yaml b/docker-compose.yaml index c2dfe11..4e2ffc7 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -1,5 +1,3 @@ -version: '3.8' - services: gotify: container_name: gotify @@ -27,6 +25,11 @@ services: security_opt: - no-new-privileges:true pull_policy: always + healthcheck: + test: [ "CMD", "curl", "-f", "http://localhost:8080/Version" ] + interval: "3s" + timeout: "3s" + retries: 5 networks: - net ports: diff --git a/iGotify Notification Assist.csproj b/iGotify Notification Assist.csproj index 272253a..7e1518a 100644 --- a/iGotify Notification Assist.csproj +++ b/iGotify Notification Assist.csproj @@ -6,20 +6,20 @@ enable true iGotify_Notification_Assist - 1.3.1.0 - 1.3.1.0 - 1.3.1.0 + 1.3.2.0 + 1.3.2.0 + 1.3.2.0 default - + - - + + - + diff --git a/iGotifyNotificationAssist.sln.DotSettings.user b/iGotifyNotificationAssist.sln.DotSettings.user index 4f3df15..c4c4f0b 100644 --- a/iGotifyNotificationAssist.sln.DotSettings.user +++ b/iGotifyNotificationAssist.sln.DotSettings.user @@ -1,2 +1,4 @@  - ForceIncluded \ No newline at end of file + ForceIncluded + ForceIncluded + ForceIncluded \ No newline at end of file