From a074d8cf10d67bf20a042c52cbe5dc1b0054d98e Mon Sep 17 00:00:00 2001
From: simon987 <me@simon987.net>
Date: Mon, 19 Dec 2022 19:05:35 -0500
Subject: [PATCH] cleanup/fixes

---
 Dockerfile                                  | 6 +++---
 Dockerfile.arm64                            | 2 +-
 sist2-admin/frontend/src/i18n/messages.js   | 2 --
 sist2-admin/frontend/src/views/Frontend.vue | 4 ----
 sist2-admin/sist2_admin/sist2.py            | 4 ++--
 sist2-admin/sist2_admin/web.py              | 1 -
 6 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 74ec8c9..7dbb9fd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -14,7 +14,7 @@ RUN cmake -DSIST_PLATFORM=x64_linux -DSIST_DEBUG=off -DBUILD_TESTS=off -DCMAKE_T
 RUN make -j$(nproc)
 RUN strip sist2 || mv sist2_debug sist2
 
-FROM --platform="linux/amd64" ubuntu:20.04
+FROM --platform="linux/amd64" ubuntu@sha256:b25ef49a40b7797937d0d23eca3b0a41701af6757afca23d504d50826f0b37ce
 
 WORKDIR /root
 
@@ -24,7 +24,7 @@ ENV LC_ALL C.UTF-8
 ENTRYPOINT ["/root/sist2"]
 
 RUN apt update && DEBIAN_FRONTEND=noninteractive apt install -y curl libasan5 libmagic1 python3  \
-    python3-pip git tesseract-ocr && rm -rf /var/lib/apt/lists/*
+    python3-pip git tesseract-ocr libpq-dev && rm -rf /var/lib/apt/lists/*
 
 RUN mkdir -p /usr/share/tessdata && \
     cd /usr/share/tessdata/ && \
@@ -36,7 +36,7 @@ RUN mkdir -p /usr/share/tessdata && \
     curl -o /usr/share/tessdata/spa.traineddata https://raw.githubusercontent.com/tesseract-ocr/tessdata/master/spa.traineddata
 
 # sist2
-COPY --from=build /build/sist2 sist2
+COPY --from=build /build/sist2 /root/sist2
 
 # sist2-admin
 COPY sist2-admin/requirements.txt sist2-admin/
diff --git a/Dockerfile.arm64 b/Dockerfile.arm64
index 039c82f..0008ec8 100644
--- a/Dockerfile.arm64
+++ b/Dockerfile.arm64
@@ -7,7 +7,7 @@ RUN cmake -DSIST_PLATFORM=arm64_linux -DSIST_DEBUG=off -DBUILD_TESTS=off -DCMAKE
 RUN make -j$(nproc)
 RUN strip sist2
 
-FROM --platform="linux/arm64/v8" ubuntu:21.10
+FROM --platform="linux/arm64/v8" ubuntu:20.04
 
 RUN apt update && apt install -y curl libasan5 && rm -rf /var/lib/apt/lists/*
 
diff --git a/sist2-admin/frontend/src/i18n/messages.js b/sist2-admin/frontend/src/i18n/messages.js
index b9a306f..5ec096b 100644
--- a/sist2-admin/frontend/src/i18n/messages.js
+++ b/sist2-admin/frontend/src/i18n/messages.js
@@ -42,8 +42,6 @@ export default {
         runJobConfirmationTitle: "Task queued",
         runJobConfirmation: "Check the Tasks page to monitor the status.",
 
-        monitoring: "Monitoring",
-        enableMonitoring: "Enable monitoring",
         extraQueryArgs: "Extra query arguments when launching from sist2-admin",
         customUrl: "Custom URL when launching from sist2-admin",
 
diff --git a/sist2-admin/frontend/src/views/Frontend.vue b/sist2-admin/frontend/src/views/Frontend.vue
index 9a70dc1..4d3c21e 100644
--- a/sist2-admin/frontend/src/views/Frontend.vue
+++ b/sist2-admin/frontend/src/views/Frontend.vue
@@ -33,10 +33,6 @@
           {{ $t("autoStart") }}
         </b-form-checkbox>
 
-        <b-form-checkbox v-model="frontend.enable_monitoring" @change="update()">
-          {{ $t("enableMonitoring") }}
-        </b-form-checkbox>
-
         <label>{{ $t("extraQueryArgs") }}</label>
         <b-form-input v-model="frontend.extra_query_args" @change="update()"></b-form-input>
 
diff --git a/sist2-admin/sist2_admin/sist2.py b/sist2-admin/sist2_admin/sist2.py
index 9ba2569..6dd38cd 100644
--- a/sist2-admin/sist2_admin/sist2.py
+++ b/sist2-admin/sist2_admin/sist2.py
@@ -251,7 +251,7 @@ class Sist2:
 
     @staticmethod
     def _consume_logs_stderr(logs_cb, proc):
-        pipe_wrapper = TextIOWrapper(proc.stderr, encoding="utf8")
+        pipe_wrapper = TextIOWrapper(proc.stderr, encoding="utf8", errors="ignore")
         try:
             for line in pipe_wrapper:
                 if line.strip() == "":
@@ -263,7 +263,7 @@ class Sist2:
 
     @staticmethod
     def _consume_logs_stdout(logs_cb, proc):
-        pipe_wrapper = TextIOWrapper(proc.stdout, encoding="utf8")
+        pipe_wrapper = TextIOWrapper(proc.stdout, encoding="utf8", errors="ignore")
         try:
             for line in pipe_wrapper:
                 if line.strip() == "":
diff --git a/sist2-admin/sist2_admin/web.py b/sist2-admin/sist2_admin/web.py
index 2391144..9ddd9ea 100644
--- a/sist2-admin/sist2_admin/web.py
+++ b/sist2-admin/sist2_admin/web.py
@@ -13,7 +13,6 @@ class Sist2Frontend(BaseModel):
     running: bool = False
 
     auto_start: bool = False
-    enable_monitoring: bool = True
     extra_query_args: str = ""
     custom_url: str = None