grav on php74/bullseye

_sys/kube-router-all-service-daemonset.yaml

@@ -17,6 +17,7 @@ data:
              "name":"kubernetes",
              "type":"bridge",
              "bridge":"kube-bridge",
+             "mtu":1420,
              "isDefaultGateway":true,
              "hairpinMode":true,
              "ipam":{
@@ -47,6 +48,7 @@ spec:
       - name: kube-router
         image: docker.io/cloudnativelabs/kube-router
         args:
+          - "--auto-mtu=false"
           - "--run-router=true"
           - "--run-firewall=true"
           - "--run-service-proxy=true"

apps/docker-registry/README.md

@@ -2,8 +2,6 @@ Docker-ui
 
 Build it for arm64:
 
-docker build --platform linux/arm64 -t joxit/docker-registry-ui:static -f static.dockerfile github.com/Joxit/docker-registry-ui
+docker build --platform linux/arm64 -t docker-registry.lan/docker-registry-ui:arm64 -f static.dockerfile github.com/Joxit/docker-registry-ui
 
-
-docker tag 1494c11066f5 docker-registry.lan/docker-registry-ui:arm64
 docker push docker-registry.lan/docker-registry-ui:arm64

apps/docker-registry/docker-registry-ui.yaml

@@ -6,7 +6,6 @@ metadata:
   labels:
     app: registry-ui
     release: docker-registry-ui
-    app/version: "1.2.1"
 spec:
   replicas: 1
   selector:
@@ -30,8 +29,8 @@ spec:
               value: "dReg"
             - name: DELETE_IMAGES
               value: "true"
-            - name: REGISTRY_URL
-              value: "http://docker-registry-ui.lan"
+            #- name: REGISTRY_URL
+            #  value: "http://docker-registry.lan"
             - name: PULL_URL
               value: "http://docker-registry.lan"
           ports:
@@ -48,11 +47,11 @@ spec:
               port: http
           resources:
             requests:
-              memory: "24Mi"
-              cpu: "50m"
+              memory: "20Mi"
+              cpu: "10m"
             limits:
-              memory: "64Mi"
-              cpu: "100m"
+              memory: "32Mi"
+              cpu: "50m"
 ---
 apiVersion: v1
 kind: Service
@@ -61,7 +60,6 @@ metadata:
   labels:
     app: registry-ui
     release: docker-registry-ui
-    app/version: "1.2.1"
 spec:
   ports:
     - port: 80

apps/nodered-deployment.yaml

@@ -25,6 +25,13 @@ spec:
           volumeMounts:
             - mountPath: /data
               name: data
+          resources:
+            limits:
+              cpu: "1"
+              memory: "200Mi"
+            requests:
+              memory: "64Mi"
+              cpu: "50m"
       volumes:
         - name: data
           persistentVolumeClaim:
@@ -54,7 +61,7 @@ metadata:
     nginx.ingress.kubernetes.io/rewrite-target: /
 spec:
   rules:
-  - host: node-red.lan
+  - host: nodered.lan
     http:
       paths:
       - path: /

apps/smarthome/Dockerfile

@@ -1,90 +1,45 @@
-# ----------------
-# STEP 1:
-# https://lobradov.github.io/Building-docker-multiarch-images/
-# Build Openzwave and Zwave2Mqtt pkg
-# All result files will be put in /dist folder
-FROM node:8.15.1-alpine AS build
+FROM node:current-buster
 
 # Set the commit of Zwave2Mqtt to checkout when cloning the repo
 ENV Z2M_VERSION=9cc3740740b57f1e896139b5ffdb25be7576ad58
+ENV DEBIAN_FRONTEND noninteractive
+
+#setup local apt cache
+RUN sed -i 's@http://@http://apt-cache.lan/@g' /etc/apt/sources.list
+#/apt-cache
 
 # Install required dependencies
-RUN apk update && apk --no-cache add \
-      gnutls \
-      gnutls-dev \
-      libusb \
-      eudev \
-      # Install build dependencies
-    && apk --no-cache --virtual .build-deps add \
-      coreutils \
-      eudev-dev \
-      build-base \
-      git \
-      python \
-      bash \
-      libusb-dev \
-      linux-headers \
-      wget \
-      tar  \
-      openssl \
-      make \
-      socat
+RUN apt update -y
+RUN apt full-upgrade -y
 
-# Build binaries and move them to /dist/lib
-RUN cd /root \
-    && wget http://old.openzwave.com/downloads/openzwave-1.4.1.tar.gz \
-    && tar zxvf openzwave-*.gz \
-    && cd openzwave-* && make && make install \
-    && mkdir -p /dist/lib \
-    && mv libopenzwave.so* /dist/lib/
-
-COPY bin/package.sh /root/package.sh
+# Packages we need
+RUN apt install -y \
+	socat libopenzwave1.5 npm git
 
 # Clone Zwave2Mqtt build pkg files and move them to /dist/pkg
-RUN npm config set unsafe-perm true && npm install -g pkg \
-    && cd /root \
-    && git clone https://github.com/OpenZWave/Zwave2Mqtt.git  \
-    && cd Zwave2Mqtt \
-    && git checkout ${Z2M_VERSION} \
-    && npm install \
-    && npm run build
-
+RUN npm config set unsafe-perm true && npm install -g pkg
 RUN cd /root \
-    && chmod +x package.sh && ./package.sh \
-    && mkdir -p /dist/pkg \
-    && mv /root/Zwave2Mqtt/pkg/* /dist/pkg
-
-# Get last config DB from main repo and move files to /dist/db
-RUN cd /root \
-    && git clone https://github.com/OpenZWave/open-zwave.git \
-    && cd open-zwave \
-    && mkdir -p /dist/db \
-    && mv config/* /dist/db
+	&& git clone https://github.com/OpenZWave/Zwave2Mqtt.git  \
+	&& cd Zwave2Mqtt \
+	&& git checkout ${Z2M_VERSION} \
+	&& npm install \
+	&& npm run build
 
 # Clean up
-RUN rm -R /root/* && apk del .build-deps
+RUN apt autoremove -y
+RUN apt clean -y
+RUN rm -rf /root/*
+RUN	apt-get clean -y
+RUN	rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
-# ----------------
-# STEP 2:
-# Run a minimal alpine image
-FROM alpine:latest
-
-LABEL maintainer="zoide"
-
-RUN apk update && apk add --no-cache \
-    libstdc++  \
-    libgcc \
-    libusb \
-    eudev 
-
-# Copy files from previous build stage
 COPY --from=build /dist/lib/ /lib/
-COPY --from=build /dist/db/ /usr/local/etc/openzwave/ 
 COPY --from=build /dist/pkg /usr/src/app
 
 # supervisor base configuration 
 ADD supervisor.conf /etc/supervisor.conf
 
+LABEL maintainer="zoide"
+
 # Set enviroment
 ENV LD_LIBRARY_PATH /lib
 
@@ -93,6 +48,3 @@ EXPOSE 8091
 CMD ["supervisord", "-c", "/etc/supervisor.conf"]
 #CMD ["/usr/src/app/zwave2mqtt"]
 
-
-
-

apps/web/grav/Dockerfile

@@ -1,4 +1,4 @@
-FROM debian:buster-slim
+FROM debian:bullseye-slim
 ENV DEBIAN_FRONTEND noninteractive
 ARG GRAV_VERSION=1.6.28
 
@@ -22,7 +22,7 @@ RUN	apt-get remove -y --purge ${DEV_PKGS} exim4* && \
 
 RUN mkdir /run/php && \
 	chown www-data:www-data /var/log /run/php && \
-	mkdir -p /etc/php/7.3/fpm/pool.d
+	mkdir -p /etc/php/7.4/fpm/pool.d
 ADD docker-entrypoint.sh /
 ADD supervisor.conf /etc/supervisor.conf
 

apps/web/grav/deployment.yaml

@@ -25,7 +25,7 @@ spec:
         - name: grav-pages
           mountPath: /var/www/grav
         - name: grav-etc-php-fpm-www-conf
-          mountPath: /etc/php/7.3/fpm/pool.d
+          mountPath: /etc/php/7.4/fpm/pool.d
       - image: nginx:alpine
         name: nginx
         imagePullPolicy: IfNotPresent

apps/web/grav/supervisor.conf

@@ -10,5 +10,5 @@ user=root
 
 
 [program:php-fpm]
-command=/usr/sbin/php-fpm7.3 --nodaemonize --force-stderr
+command=/usr/sbin/php-fpm7.4 --nodaemonize --force-stderr
 user=www-data

prometheus/additional-scrape-configs.yaml

@@ -1,6 +1,6 @@
 apiVersion: v1
 data:
-  prometheus-additional.yaml: LSBqb2JfbmFtZTogbXlzcWxkCiAgc3RhdGljX2NvbmZpZ3M6CiAgLSB0YXJnZXRzOgogICAgLSBtYXJpYWRiLmxhbjo5MTA0Ci0gam9iX25hbWU6IG1xdHQubW9zcXVpdHRvCiAgc3RhdGljX2NvbmZpZ3M6CiAgLSB0YXJnZXRzOgogICAgLSBtcXR0Lmxhbjo5MjM0Ci0gam9iX25hbWU6IGhhcHJveHkKICBzdGF0aWNfY29uZmlnczoKICAtIHRhcmdldHM6CiAgICAtIGRydWNraS53a3M6OTEwMQogICAgLSByaW90MDEuY2hhb3M6OTEwMQogICAgLSBhdXRvOjkxMDEKLSBqb2JfbmFtZToga2xpcHBlcgogIHN0YXRpY19jb25maWdzOgogIC0gdGFyZ2V0czoKICAgIC0gZHJ1Y2tpLndrczozOTAzCi0gam9iX25hbWU6IG9jdG9wcmludAogIG1ldHJpY3NfcGF0aDogL3BsdWdpbi9wcm9tZXRoZXVzX2V4cG9ydGVyL21ldHJpY3MKICBwYXJhbXM6CiAgICBhcGlrZXk6CiAgICAtIDMwRThCMDFCRkQ2NzRFNUJCRDQ0NkQwOEM0NzMwREY0CiAgc3RhdGljX2NvbmZpZ3M6CiAgLSB0YXJnZXRzOgogICAgLSBkcnVja2kud2tzOjgwCi0gam9iX25hbWU6IG9wZW5oYWIyCiAgbWV0cmljc19wYXRoOiAvCiAgc3RhdGljX2NvbmZpZ3M6CiAgLSB0YXJnZXRzOgogICAgLSBhdXRvLmNoYW9zOjk5OTkKLSBqb2JfbmFtZTogbm9kZQogIHN0YXRpY19jb25maWdzOgogIC0gdGFyZ2V0czoKICAgIC0gZHVtb250LmNoYW9zOjkxMDAKICAgIC0gZHVtb250Lndrczo5MTAwCiAgICAtIGF1dG8wMTo5MTAwCiAgICAtIGRydWNraS53a3M6OTEwMAogICAgLSBlYmluMDEuY2hhb3M6OTEwMAogICAgLSBlYmluMDIuY2hhb3M6OTEwMAogICAgLSByaW90MDEuY2hhb3M6OTEwMAogICAgLSB0cnVoZTo5MTAwCiAgICAtIHR1bW9yLmNoYW9zOjkxMDAKICAgIC0gd29obno6OTEwMAogICAgLSB5b3JpLmNoYW9zOjkxMDAK
+  prometheus-additional.yaml: LSBqb2JfbmFtZTogZ2l0ZWEKICBzdGF0aWNfY29uZmlnczoKICAtIHRhcmdldHM6CiAgICAtIGdpdC11aS5sYW4KLSBqb2JfbmFtZTogbmdpbngKICBzdGF0aWNfY29uZmlnczoKICAtIHRhcmdldHM6CiAgICAtIGF1dG8uY2hhb3M6OTExMwotIGpvYl9uYW1lOiBteXNxbGQKICBzdGF0aWNfY29uZmlnczoKICAtIHRhcmdldHM6CiAgICAtIG1hcmlhZGIubGFuOjkxMDQKLSBqb2JfbmFtZTogbXF0dC5tb3NxdWl0dG8KICBzdGF0aWNfY29uZmlnczoKICAtIHRhcmdldHM6CiAgICAtIG1xdHQubGFuOjkyMzQKLSBqb2JfbmFtZTogaGFwcm94eQogIHN0YXRpY19jb25maWdzOgogIC0gdGFyZ2V0czoKICAgIC0gZHJ1Y2tpLndrczo5MTAxCi0gam9iX25hbWU6IGtsaXBwZXIKICBzdGF0aWNfY29uZmlnczoKICAtIHRhcmdldHM6CiAgICAtIGRydWNraS53a3M6MzkwMwotIGpvYl9uYW1lOiBvY3RvcHJpbnQKICBtZXRyaWNzX3BhdGg6IC9wbHVnaW4vcHJvbWV0aGV1c19leHBvcnRlci9tZXRyaWNzCiAgcGFyYW1zOgogICAgYXBpa2V5OgogICAgLSAzMEU4QjAxQkZENjc0RTVCQkQ0NDZEMDhDNDczMERGNAogIHN0YXRpY19jb25maWdzOgogIC0gdGFyZ2V0czoKICAgIC0gZHJ1Y2tpLndrczo4MAotIGpvYl9uYW1lOiBvcGVuaGFiMgogIG1ldHJpY3NfcGF0aDogLwogIHN0YXRpY19jb25maWdzOgogIC0gdGFyZ2V0czoKICAgIC0gYXV0by5jaGFvczo5OTk5Ci0gam9iX25hbWU6IG5vZGUKICBzdGF0aWNfY29uZmlnczoKICAtIHRhcmdldHM6CiAgICAtIGR1bW9udC5jaGFvczo5MTAwCiAgICAtIGR1bW9udC53a3M6OTEwMAogICAgLSBhdXRvMDE6OTEwMAogICAgLSBkcnVja2kud2tzOjkxMDAKICAgIC0gZWJpbjAxLmNoYW9zOjkxMDAKICAgIC0gZWJpbjAyLmNoYW9zOjkxMDAKICAgIC0gcmlvdDAxLmNoYW9zOjkxMDAKICAgIC0gdHJ1aGU6OTEwMAogICAgLSB0dW1vci5jaGFvczo5MTAwCiAgICAtIHdvaG56OjkxMDAKICAgIC0geW9yaS5jaGFvczo5MTAwCg==
 kind: Secret
 metadata:
   creationTimestamp: null

prometheus/prometheus-additional.yaml

@@ -1,3 +1,11 @@
+- job_name: gitea
+  static_configs:
+  - targets:
+    - git-ui.lan
+- job_name: nginx
+  static_configs:
+  - targets:
+    - auto.chaos:9113
 - job_name: mysqld
   static_configs:
   - targets:
@@ -10,8 +18,6 @@
   static_configs:
   - targets:
     - drucki.wks:9101
-    - riot01.chaos:9101
-    - auto:9101
 - job_name: klipper
   static_configs:
   - targets: