Update Dockerfiles. Change log file defaults. (#1210)

Author: davidnewhall

examples/notifiarr.conf.example

@@ -1,24 +1,26 @@
 ###############################################
 # Notifiarr Client Example Configuration File #
-# Created by Notifiarr v0.4.4   @ 232801T0734 #
+# Created by Notifiarr v0.9.3rc1@ 262402T0654 #
 ###############################################
 
 ## This API key must be copied from your notifiarr.com account.
 api_key = "api-key-from-notifiarr.com"
 
-## Setting a UI password enables the human accessible web GUI. Must be at least 9 characters.
+## Setting a UI password properly secures the Web UI. Must be at least 9 characters.
 ## The default username is admin; change it by setting ui_password to "username:password"
 ## Set to "webauth" to disable the login form and use only proxy authentication. See upstreams, below.
 ## Your auth proxy must pass the x-webauth-user header if you set this to "webauth".
 ## You may also set a custom auth header by setting to "webauth:<header>" e.g. "webauth:remote-user"
-## Disable auth by setting this to "noauth". Not recommended. Requires "upstreams" being set.
-ui_password = ""
+## Disable auth by setting this to "noauth". Not recommended and requires "upstreams" being set.
+## If you leave this unset the password will be set to the API key defined at the top of this file.
+## Changing the password in the Web UI encrypts it, and that is recommended.
+ui_password = ''''''
 
 ## The ip:port to listen on for incoming HTTP requests. 0.0.0.0 means all/any IP and is recommended!
 ## You may use "127.0.0.1:5454" to listen only on localhost; good if using a local proxy.
 ## This is used to receive Plex webhooks and Media Request commands.
 ##
-bind_addr = "0.0.0.0:5454"
+bind_addr = '''0.0.0.0:5454'''
 
 ## This application can update itself on Windows systems.
 ## Set this to "daily" to check GitHub every day for updates.
@@ -35,16 +37,20 @@ quiet = false
 
 ## Debug prints more data and json payloads. This increases application memory usage.
 debug = false
-
+##
 ## Trace logs function entry/exit with request IDs. Use for debugging request flow.
 trace = false
-
-max_body = 0 # maximum body size for debug logs. 0 = no limit.
+##
+max_body = 102400 # maximum body size for debug logs. 0 = no limit.
 
 ## All API paths start with /api. This does not affect incoming /plex webhooks.
 ## Change it to /somethingelse/api by setting urlbase to "/somethingelse"
 ##
-urlbase = "/"
+urlbase = '''/'''
+
+## Disable compression of payloads sent to the website.
+##
+no_compress = false
 
 ## Allowed upstream networks. Networks here are allowed to send two special headers:
 ## (1) x-forwarded-for (2) x-webauth-user
@@ -68,15 +74,19 @@ urlbase = "/"
 #http_log = '~/.notifiarr/notifiarr.http.log'
 ##
 ## Set this to the number of megabytes to rotate files.
-log_file_mb = 100
+log_file_mb = 5
 ##
 ## How many files to keep? 0 = all.
-log_files = 0
+log_files = 10
 ##
 ## Unix file mode for new log files. Umask also affects this.
 ## Missing, blank or 0 uses default of 0600. Permissive is 0644. Ignored by Windows.
 file_mode = "0600"
 
+## Disallow the website from triggering (log file) uploads. Sometimes an admin needs to see client
+## logs while diagnosing problems. You can disable this ability by setting no_uploads to true.
+no_uploads = false
+
 ## Web server and website timeout.
 ##
 timeout = "1m"
@@ -96,6 +106,11 @@ serial = false
 ## Setting this to 0 will take the default of 4. Use 1 to disable retrying.
 retries = 4
 
+## The version of the config file. The app uses this to verify the config
+## version the front-end updates is not older than the back-end version.
+version = 1
+
+
 ##################
 # Starr Settings #
 ##################
@@ -160,6 +175,13 @@ retries = 4
 #pass     = ""
 
 
+#[[transmission]]
+#name     = ""  # Set a name to enable checks of your service.
+#url      = "http://transmission:9091/transmission/rpc"
+#user     = ""
+#pass     = ""
+
+
 #[[nzbget]]
 #name     = ""  # Set a name to enable checks of your service.
 #url      = "http://nzbget:6789/"
@@ -219,9 +241,9 @@ retries = 4
 # SMI Path is found automatically if left blank. Set it to path to nvidia-smi (nvidia-smi.exe on Windows).
 
 [snapshot.nvidia]
-disabled = false
-smi_path = ''''''
-bus_ids  = []
+  disabled = false
+  smi_path = ''''''
+  bus_ids  = []
 
 ##################
 # Service Checks #
@@ -235,7 +257,6 @@ bus_ids  = []
 
 [services]
   disabled = false # Setting this to true disables all service checking routines.
-  interval = "10m" # How often to send service states to Notifiarr.com. Minimum = 5m.
   log_file = ''    # Service Check logs go to the app log by default. Change that by setting a services.log file here.
 
 ## Uncomment the following section to create a service check on a URL or IP:port.
@@ -276,7 +297,7 @@ bus_ids  = []
 #  pipe  = false
 #  must_exist = false
 #  log_match  = true
-
+#  disabled   = false
 
 
 ###################
@@ -298,3 +319,50 @@ bus_ids  = []
 #  log     = true
 #  notify  = true
 #  timeout = "10s"
+
+
+############################
+# Endpoint URL Passthrough #
+############################
+
+## The Endpoint URL Passthrough feature allows you to configure the client to poll
+## any URL and send the response to the Notifiarr website for notification processing.
+## @name          - Defaults to URL. Name is used in logs and to identify this endpoint remotely.
+## @url           - Required URL to poll. Query is optional here, can be added in query param.
+## @method        - defaults to GET. Can use POST, PUT, etc.
+## @timeout       - How long to wait for the http request to complete. Default is no timeout.
+## @template      - Helps the website identify which template to parse this data into.
+##                  Setting this to "false" will skip sending the response to the website.
+## @body          - For POST and PUT this is the body payload that is sent.
+## @follow        - Follow redirects? Default is false, do not follow 301/302s.
+## @frequency     - 0: no schedule, 1: minutely, 2: hourly, 3: daily, 4: weekly, 5: monthly
+## @interval      - How often to schedule when frequency is 3, 4 or 5.
+## @days_of_week  - List of days. Used when frequency is 4. Allowed values 0-6, 0 = Sunday.
+## @days_of_month - List of days. Used when frequency is 5. Allowed values 1-31 and -31 to -1.
+## @months        - List of months. Currently not used. Allowed values: 1-12, 1 = January.
+## @at_times      - List of tuples [hours,minutes,seconds] to schedule when frequency is 3, 4 or 5.
+##                  Only seconds are used when frequency is 1, only minutes when frequency is 2.
+## @header        - Map of header names to values sent with the http request to the URL.
+## @query         - Map of query names to values appended to the url in the request.
+##
+## Full Example Follows (remove the leading # hashes to use it):
+##
+#[[endpoint]]
+#  name          = "My Example"
+#  url           = "http://example.com"
+#  valid_ssl     = true
+#  method        = "GET"
+#  timeout       = "0s"
+#  template      = "pihole"
+#  body          = ''
+#  follow        = false
+#  frequency     = 1
+#  interval      = 1
+#  days_of_week  = [0]
+#  days_of_month = [1]
+#  months        = [1]
+#  at_times      = [[0,0,0]]
+#  [endpoint.header]
+#    x-api-key = ["abc123"]
+#  [endpoint.query]
+#    apiKey = ["abc123"]

init/docker/Dockerfile.alpine

@@ -1,17 +1,19 @@
 FROM golang:1.26.0-alpine AS builder
 
-# Build speed magic!
-# https://www.docker.com/blog/faster-multi-platform-builds-dockerfile-cross-compilation-guide/
 WORKDIR /src
 COPY main.go go.mod go.sum ./
 
 # Cache all the needed tools.
 RUN go mod download \
     && go run github.com/swaggo/swag/cmd/swag@latest -v
 
+# Install Node.js to build the frontend.
 RUN apk add nodejs npm
+
+# Copy the source code.
 COPY pkg pkg
 COPY frontend frontend
+# Build the frontend.
 RUN --mount=type=secret,id=FONTAWESOME_PACKAGE_TOKEN,env=FONTAWESOME_PACKAGE_TOKEN \
     mkdir -p ./frontend/dist \
     && echo "Fake frontend build." > ./frontend/dist/index.html \
@@ -36,19 +38,20 @@ RUN GOFLAGS="-trimpath -mod=readonly -modcacherw" \
     -X \"golift.io/version.Version=${VERSION}\""
 
 FROM alpine
-
+# Copy the binary.
 COPY --from=builder /tmp/notifiarr /
-# Other tools.
-RUN apk add ipmitool smartmontools zfs sysstat && \
+# Other tools. (iostat is the wrong version on Alpine.)
+RUN apk add ipmitool smartmontools zfs sysstat libncurses6 && \
     rm -f /bin/iostat
-
+# Defaults.
 ENV TZ=UTC
 ENV PATH=/bin:/usr/bin:/sbin:/usr/sbin
 ENV USER=root
 
 EXPOSE 5454
 ENTRYPOINT [ "/notifiarr" ]
 
+# Label inputs.
 ARG TARGETOS
 ARG TARGETARCH
 ARG BUILD_DATE

init/docker/Dockerfile.cuda

@@ -1,19 +1,21 @@
 FROM golang:1.26.0-bookworm AS builder
 
-# Build speed magic!
-# https://www.docker.com/blog/faster-multi-platform-builds-dockerfile-cross-compilation-guide/
 WORKDIR /src
 COPY main.go go.mod go.sum ./
 
 # Cache all the needed tools.
 RUN go mod download \
     && go run github.com/swaggo/swag/cmd/swag@latest -v
 
+# Install Node.js to build the frontend.
+ENV DEBIAN_FRONTEND=noninteractive
 RUN curl -fsSL https://deb.nodesource.com/setup_24.x | bash \
     && apt install -y nodejs
 
+# Copy the source code.
 COPY pkg pkg
 COPY frontend frontend
+# Build the frontend.
 RUN --mount=type=secret,id=FONTAWESOME_PACKAGE_TOKEN,env=FONTAWESOME_PACKAGE_TOKEN \
     mkdir -p ./frontend/dist \
     && echo "Fake frontend build." > ./frontend/dist/index.html \
@@ -43,27 +45,26 @@ RUN GOFLAGS="-trimpath -mod=readonly -modcacherw" \
     -X \"golift.io/version.Revision=${ITERATION}\" \
     -X \"golift.io/version.Version=${VERSION}\""
 
-FROM nvidia/cuda:13.1.1-base-ubuntu22.04
-
+FROM nvidia/cuda:13.1.1-base-ubuntu24.04
+# Copy the binary.
 COPY --from=builder /tmp/notifiarr /
 # Other tools.
-RUN apt update \
-    && apt install -y smartmontools ipmitool zfsutils-linux sysstat \
+RUN DEBIAN_FRONTEND=noninteractive apt update \
+    && apt install -y smartmontools ipmitool zfsutils-linux sysstat libncurses6 \
     && apt clean \
     && rm -rf /var/lib/apt/lists/*
-# For megacli.
+# For LSI Avago Broadcom MegaCli.
 COPY --from=builder /MegaCli* /libstorelibir-2.so.14.07-0 /
-RUN mkdir -p /usr/lib/x86_64-linux-gnu && \
-    ln -s /usr/lib/x86_64-linux-gnu/libncurses.so.6 /usr/lib/x86_64-linux-gnu/libncurses.so.5
-
+# Defaults.
+ENV DN_SNAPSHOT_NVIDIA_SMI_PATH=/usr/bin/nvidia-smi
 ENV TZ=UTC
 ENV PATH=/bin:/usr/bin:/sbin:/usr/sbin
 ENV USER=root
-ENV DN_SNAPSHOT_NVIDIA_SMI_PATH=/usr/bin/nvidia-smi
 
 EXPOSE 5454
 ENTRYPOINT [ "/notifiarr" ]
 
+# Label inputs.
 ARG TARGETOS
 ARG TARGETARCH
 ARG BUILD_DATE

init/docker/Dockerfile.ubuntu

@@ -1,14 +1,13 @@
 FROM golang:1.26.0-trixie AS builder
 
-# Build speed magic!
-# https://www.docker.com/blog/faster-multi-platform-builds-dockerfile-cross-compilation-guide/
 WORKDIR /src
 COPY main.go go.mod go.sum ./
 
 # Cache all the needed tools.
 RUN go mod download \
     && go run github.com/swaggo/swag/cmd/swag@latest -v
 
+ENV DEBIAN_FRONTEND=noninteractive
 RUN curl -fsSL https://deb.nodesource.com/setup_24.x | bash \
     && apt install -y nodejs
 
@@ -44,26 +43,24 @@ RUN GOFLAGS="-trimpath -mod=readonly -modcacherw" \
     -X \"golift.io/version.Version=${VERSION}\""
 
 FROM ubuntu:24.04
-
+# Copy the binary.
 COPY --from=builder /tmp/notifiarr /
 # Other tools.
-RUN apt update \
-    && apt install -y smartmontools ipmitool zfsutils-linux sysstat \
+RUN DEBIAN_FRONTEND=noninteractive apt update \
+    && apt install -y smartmontools ipmitool zfsutils-linux sysstat libncurses6 \
     && apt clean \
     && rm -rf /var/lib/apt/lists/*
-# For megacli.
+# For LSI Avago Broadcom MegaCli.
 COPY --from=builder /MegaCli* /libstorelibir-2.so.14.07-0 /
-RUN mkdir -p /usr/lib/x86_64-linux-gnu && \
-    ln -s /usr/lib/x86_64-linux-gnu/libncurses.so.6 /usr/lib/x86_64-linux-gnu/libncurses.so.5
-
+# Defaults.
 ENV TZ=UTC
 ENV PATH=/bin:/usr/bin:/sbin:/usr/sbin
 ENV USER=root
-ENV DN_SNAPSHOT_NVIDIA_SMI_PATH=/usr/bin/nvidia-smi
 
 EXPOSE 5454
 ENTRYPOINT [ "/notifiarr" ]
 
+# Label inputs.
 ARG TARGETOS
 ARG TARGETARCH
 ARG BUILD_DATE

pkg/configfile/config.go

@@ -78,6 +78,7 @@ func NewConfig() *Config {
 		AppsConfig: apps.AppsConfig{
 			BaseConfig: apps.BaseConfig{
 				URLBase: "/",
+				MaxBody: mnd.KB100,
 			},
 		},
 		Services: services.Config{},

pkg/configfile/template.go

@@ -566,7 +566,6 @@ version = {{.Version}}
   disabled = true{{end}}{{end}}
 {{end}}{{end}}
 
-
 ###################
 # Custom Commands #
 ###################

pkg/logs/logs.go

@@ -46,8 +46,8 @@ type Logger struct {
 //
 //nolint:gochecknoglobals
 var (
-	logFiles  = 1
-	logFileMb = 100
+	logFiles  = 10
+	logFileMb = 5
 	customLog = make(map[string]*rotatorr.Logger)
 )
 

pkg/mnd/constants.go

@@ -47,8 +47,8 @@ const (
 const (
 	Title            = "Notifiarr"
 	DefaultName      = "notifiarr"
-	DefaultLogFileMb = 100
-	DefaultLogFiles  = 0 // delete none
+	DefaultLogFileMb = 5
+	DefaultLogFiles  = 10
 	DefaultEnvPrefix = "DN"
 	DefaultTimeout   = time.Minute
 	DefaultBindAddr  = "0.0.0.0:5454"