From 62cb2881c2ee4cb88c4f31e5eabbfbc8e522e9f7 Mon Sep 17 00:00:00 2001
From: Udo Waechter <udo@maketank.net>
Date: Wed, 11 Nov 2020 21:00:58 +0100
Subject: [PATCH] d-ui needs less resources

---
 apps/docker-registry/docker-registry-ui.yaml | 10 +--
 apps/smarthome/Dockerfile                    | 78 ++++----------------
 2 files changed, 17 insertions(+), 71 deletions(-)

diff --git a/apps/docker-registry/docker-registry-ui.yaml b/apps/docker-registry/docker-registry-ui.yaml
index 3685c5e..f179c8a 100644
--- a/apps/docker-registry/docker-registry-ui.yaml
+++ b/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:
@@ -48,11 +47,11 @@ spec:
               port: http
           resources:
             requests:
-              memory: "24Mi"
-              cpu: "50m"
+              memory: "10Mi"
+              cpu: "1m"
             limits:
-              memory: "64Mi"
-              cpu: "100m"
+              memory: "32Mi"
+              cpu: "30m"
 ---
 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
diff --git a/apps/smarthome/Dockerfile b/apps/smarthome/Dockerfile
index 1c87d75..9ec4fc3 100644
--- a/apps/smarthome/Dockerfile
+++ b/apps/smarthome/Dockerfile
@@ -1,44 +1,17 @@
-# ----------------
-# 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-slim
 
 # Set the commit of Zwave2Mqtt to checkout when cloning the repo
 ENV Z2M_VERSION=9cc3740740b57f1e896139b5ffdb25be7576ad58
+ENV DEBIAN_FRONTEND noninteractive
 
 # 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 && \
+	apt full-upgrade -y && \
+	apt autoremove -y && \
+	apt clean -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
+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 \
@@ -49,42 +22,20 @@ RUN npm config set unsafe-perm true && npm install -g pkg \
     && npm install \
     && npm run build
 
-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
-
 # Clean up
-RUN rm -R /root/* && apk del .build-deps
+RUN rm -rf /root/* && \
+	apt-get clean -y && \
+	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 +44,3 @@ EXPOSE 8091
 CMD ["supervisord", "-c", "/etc/supervisor.conf"]
 #CMD ["/usr/src/app/zwave2mqtt"]
 
-
-
-