Issue #222 fix faulty samba-dc image; improve nut-upsd verbosity parameter (#225)

Author: instantlinux

images/nut-upsd/Dockerfile

@@ -15,12 +15,15 @@ ENV API_USER=upsmon \
     GROUP=nut \
     MAXAGE=15 \
     NAME=ups \
+    NUT_DEBUG_LEVEL=0 \
+    NUT_QUIET_INIT_SSL=true \
+    NUT_QUIET_INIT_UPSNOTIFY=true \
     POLLINTERVAL= \
     PORT=auto \
     SDORDER= \
     SECRETNAME=nut-upsd-password \
     SERIAL= \
-    SERVER=master \
+    SERVER=primary \
     ULIMIT=2048 \
     USER=nut \
     VENDORID=

images/nut-upsd/README.md

@@ -45,12 +45,15 @@ DRIVER | usbhid-ups | driver (see [compatibility list](http://networkupstools.or
 GROUP | nut | local group
 MAXAGE | 15 | seconds before declaring driver non-responsive
 NAME | ups | user-assigned config name
+NUT_DEBUG_LEVEL | 0 | verbosity of debug messages
+NUT_QUIET_INIT_SSL | true | inhibit superfluous startup warning
+NUT_QUIET_INIT_UPSNOTIFY | true | inhibit superfluous startup warning
 POLLINTERVAL | | Poll Interval for ups.conf
 PORT | auto | device port (e.g. /dev/ttyUSB0) on host
 SDORDER | | UPS shutdown sequence, set to -1 to disable shutdown
 SECRETNAME | nut-upsd-password | name of secret to use for API user
 SERIAL | | hardware serial number of UPS
-SERVER | master | master or slave priority for scripts
+SERVER | primary | primary instance shuts down after secondaries
 ULIMIT | 2048 | open-files ulimit
 USER | nut | local user
 VENDORID | | vendor ID for ups.conf

images/nut-upsd/docker-compose.yml

@@ -5,6 +5,7 @@ services:
     image: ${REGISTRY_URI:-instantlinux}/nut-upsd:latest
     restart: always
     environment:
+      NUT_DEBUG_LEVEL: 0
       SERIAL: ${UPS_1_SERIAL}
     ports:
     - ${PORT_UPSD_1:-3493}:3493

images/nut-upsd/entrypoint.sh

@@ -72,4 +72,4 @@ echo 0 > /var/run/upsmon.pid
 ulimit -n $ULIMIT
 /usr/sbin/upsdrvctl -u root start
 /usr/sbin/upsd -u $USER
-exec /usr/sbin/upsmon -D
+exec /usr/sbin/upsmon -F

images/nut-upsd/helm/Chart.yaml

@@ -6,8 +6,8 @@ sources:
 - https://github.com/instantlinux/docker-tools
 - https://github.com/networkupstools/nut
 type: application
-version: 0.1.8
-appVersion: "2.8.2-r2"
+version: 0.1.9
+appVersion: "2.8.3-r2"
 dependencies:
 - name: chartlib
   version: 0.1.8

images/nut-upsd/helm/values.yaml

@@ -3,6 +3,7 @@ deployment:
   env:
     driver: usbhid-ups
     maxage: 15
+    nut_debug_level: 0
     serial: mustbeset
   securityContext:
     privileged: true

images/samba-dc/Dockerfile

@@ -28,8 +28,9 @@ ARG SAMBA_VERSION=4.21.4-r4
 
 COPY *.conf.j2 /root/
 COPY entrypoint.sh /usr/local/bin/
-RUN apk add --update --no-cache krb5 ldb-tools samba-dc=$SAMBA_VERSION samba-winbind-clients=$SAMBA_VERSION tdb \
-      bind bind-libs bind-tools libcrypto3 libxml2 tzdata py3-setuptools py3-pip && \
+RUN apk add --update --no-cache krb5 ldb-tools samba-dc=$SAMBA_VERSION \
+      samba-winbind-clients=$SAMBA_VERSION tdb bind bind-libs bind-tools \
+      libcrypto3 libxml2 tzdata py3-cryptography py3-setuptools py3-pip && \
     pip install jinjanator --break-system-packages && \
     apk del py3-pip && \
     chmod 0755 /usr/local/bin/entrypoint.sh