SYS-616 wip

instantlinux · Mar 4, 2024 · a9e3d32 · a9e3d32
1 parent ce26ea6
commit a9e3d32
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 6 deletions.
diff --git a/images/nut-upsd/Dockerfile b/images/nut-upsd/Dockerfile
@@ -26,8 +26,8 @@ ENV API_USER=upsmon \
 HEALTHCHECK CMD upsc $NAME@localhost:3493 2>&1|grep -q stale && \
     kill -SIGTERM -1 || true
 
-RUN apk add --update nut=$NUT_VERSION \
-      libcrypto3 libssl3 libusb musl net-snmp-libs
+RUN apk add --update --no-cache nut=$NUT_VERSION \
+      libcrypto3 libssl3 libusb musl net-snmp-libs util-linux
 
 EXPOSE 3493
 COPY entrypoint.sh /usr/local/bin/

diff --git a/images/postfix-python/README.md b/images/postfix-python/README.md
@@ -1,5 +1,5 @@
 ## postfix-python
-[![](https://img.shields.io/docker/v/instantlinux/postfix-python?sort=date)](https://hub.docker.com/r/instantlinux/postfix-python/tags "Version badge") [![](https://img.shields.io/docker/image-size/instantlinux/postfix-python?sort=date)](https://github.com/instantlinux/docker-tools/tree/main/images/postfix-python "Image badge") ![](https://img.shields.io/badge/platform-amd64%20arm64%20arm%2Fv6%20arm%2Fv7-blue "Platform badge") [![](https://img.shields.io/badge/dockerfile-latest-blue)](https://gitlab.com/instantlinux/docker-tools/-/blob/main/images/postfix-python/Dockerfile "dockerfile")
+[![](https://img.shields.io/docker/v/instantlinux/postfix-python?sort=date)](https://hub.docker.com/r/instantlinux/postfix-python/tags "Version badge") [![](https://img.shields.io/docker/image-size/instantlinux/postfix-python?sort=date)](https://github.com/instantlinux/docker-tools/tree/main/images/postfix-python "Image badge") ![](https://img.shields.io/badge/platform-amd64%20arm64%20aarch64-blue "Platform badge") [![](https://img.shields.io/badge/dockerfile-latest-blue)](https://gitlab.com/instantlinux/docker-tools/-/blob/main/images/postfix-python/Dockerfile "dockerfile")
 
 Postfix with python support. (Python needed for blacklist utility.) This repo has complete instructions for
 [building a kubernetes cluster](https://github.com/instantlinux/docker-tools/blob/main/k8s/README.md) where you can launch with [helm](https://github.com/instantlinux/docker-tools/tree/main/images/postfix-python/helm) or [kubernetes.yaml](https://github.com/instantlinux/docker-tools/blob/main/images/postfix-python/kubernetes.yaml) using _make_ and customizing [Makefile.vars](https://github.com/instantlinux/docker-tools/blob/main/k8s/Makefile.vars) after cloning this repo:

diff --git a/images/postfix-python/helm/Chart.yaml b/images/postfix-python/helm/Chart.yaml
@@ -6,7 +6,7 @@ sources:
 - https://github.com/instantlinux/docker-tools
 - https://github.com/vdukhovni/postfix
 type: application
-version: 0.1.11
+version: 0.1.12
 appVersion: "3.8.3-r1"
 dependencies:
 - name: chartlib

diff --git a/images/weewx/Dockerfile b/images/weewx/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.18
+FROM alpine:3.17
 MAINTAINER Rich Braun "[email protected]"
 ARG BUILD_DATE
 ARG VCS_REF
@@ -67,7 +67,9 @@ RUN apk add --no-cache --update \
     apk add --no-cache --virtual .fetch-deps \
       file freetype-dev g++ gawk gcc git jpeg-dev libpng-dev make musl-dev \
       py3-pip py3-wheel python3-dev zlib-dev && \
-    pip install -r /root/requirements.txt --break-system-packages && \
+    # TODO
+    # pip install -r /root/requirements.txt --break-system-packages && \
+    pip install -r /root/requirements.txt && \
     tar xf weewx.tar.gz --strip-components=1 && \
     cd /build && \
     ./setup.py build && ./setup.py install < /root/install-input.txt && \

diff --git a/k8s/helm/gitea/values.yaml b/k8s/helm/gitea/values.yaml
@@ -1,3 +1,4 @@
+# Default values for gitea.
 tlsHostname: gitea.example.com
 nodeportSSH: 30999
 # TODO - if only there were a way to reference these values within