add readinessProbe to web image

Update web image to 18.04

images/ny-power-web/Dockerfile

@@ -1,11 +1,9 @@
-FROM ubuntu:xenial
+FROM ubuntu:18.04
 
 ENV DEBIAN_FRONTEND noninteractive
 ENV LANG C.UTF-8
 ENV LC_ALL C.UTF-8
-ENV FLASK_APP /root/app.py
-
-USER root
+ENV FLASK_APP /www/app.py
 
 RUN apt-get update && apt-get install -y python3 python3-pip && apt-get clean
 
@@ -14,10 +12,15 @@ RUN pip3 install -U influxdb
 RUN pip3 install -U paho-mqtt
 RUN rm -rf /root/.cache
 
-COPY app.py /root/app.py
-COPY templates/ /root/templates/
-COPY static/ /root/static/
+RUN groupadd -r www && useradd --no-log-init -r -g www www
+RUN mkdir -p /www/ && chown -R www /www
+
+COPY app.py /www/
+COPY templates/ /www/templates/
+COPY static/ /www/static/
 
 EXPOSE 5000
 
+USER www
+
 CMD flask run --host=0.0.0.0

ny-power/templates/web.yaml

@@ -122,6 +122,13 @@ spec:
               secretKeyRef:
                 name: {{ template "ny-power.fullname" . }}-mqtt-pump
                 key: password
+        readinessProbe:
+          httpGet:
+            path: /
+            port: 5000
+          initialDelaySeconds: 15
+          timeoutSeconds: 1
+
 ---
 apiVersion: v1
 kind: Service