Cleanup

dubo-dubon-duponey · Mar 15, 2024 · da6a039 · da6a039
1 parent 5b8d663
commit da6a039
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 3 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -13,8 +13,8 @@ FROM          $FROM_REGISTRY/$FROM_IMAGE_TOOLS
 FROM          --platform=$BUILDPLATFORM $FROM_REGISTRY/$FROM_IMAGE_BUILDER                                              AS fetcher-lego
 
 ARG           GIT_REPO=github.com/go-acme/lego
-ARG           GIT_VERSION=v4.15.0
-ARG           GIT_COMMIT=46fe435c2c2e447ae48df712eca8278bbca8986e
+ARG           GIT_VERSION=v4.16.1
+ARG           GIT_COMMIT=40dcce60be3dbbd0ae05b789e486341b6741e2ae
 
 ENV           WITH_BUILD_SOURCE="./cmd/lego"
 ENV           WITH_BUILD_OUTPUT="lego"

diff --git a/context/runtime/boot/helpers.sh b/context/runtime/boot/helpers.sh
@@ -10,3 +10,23 @@ helpers::dir::writable(){
     exit 1
   }
 }
+
+helpers::log::normalize(){
+  local lower
+  lower="$(printf "%s" "${LOG_LEVEL:-}" | tr '[:upper:]' '[:lower:]')"
+  case "$lower" in
+  "debug")
+  ;;
+  "info")
+  ;;
+  "error")
+  ;;
+  *)
+    lower="warning"
+  ;;
+  esac
+  LOG_LEVEL="$lower"
+  printf "%s" "$LOG_LEVEL"
+}
+
+helpers::log::normalize >/dev/null
diff --git a/context/runtime/boot/mdns.sh b/context/runtime/boot/mdns.sh
@@ -61,7 +61,7 @@ mdns::start::avahi(){
   # Cleanup leftovers on container restart
   rm -f "$(dirname "$avahisocket")/pid"
 
-  [ "$(printf "%s" "$LOG_LEVEL" | tr '[:upper:]' '[:lower:]')" != "debug" ] || args+=(--debug)
+  [ "$LOG_LEVEL" != "debug" ] || args+=(--debug)
 
   # -D/--daemonize implies -s/--syslog that we do not want, so, just background it
   avahi-daemon -f /config/avahi/main.conf --no-drop-root --no-chroot "${args[@]}" &