simon987/sist2
1
0
Fork 0
mirror of https://github.com/simon987/sist2.git synced 2025-04-20 02:36:43 +00:00
Code Issues Projects Releases Wiki Activity

cleanup/fixes

Browse Source
This commit is contained in:
simon987 2022-12-19 19:05:35 -05:00
parent 795b6e2e2e
commit a074d8cf10
6 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Dockerfile
View File

@ -14,7 +14,7 @@ RUN cmake -DSIST_PLATFORM=x64_linux -DSIST_DEBUG=off -DBUILD_TESTS=off -DCMAKE_T
RUN make -j$(nproc) RUN make -j$(nproc)
RUN strip sist2 || mv sist2_debug sist2 RUN strip sist2 || mv sist2_debug sist2
FROM --platform="linux/amd64" ubuntu:20.04 FROM --platform="linux/amd64" ubuntu@sha256:b25ef49a40b7797937d0d23eca3b0a41701af6757afca23d504d50826f0b37ce
WORKDIR /root WORKDIR /root
@ -24,7 +24,7 @@ ENV LC_ALL C.UTF-8
ENTRYPOINT ["/root/sist2"] ENTRYPOINT ["/root/sist2"]
RUN apt update && DEBIAN_FRONTEND=noninteractive apt install -y curl libasan5 libmagic1 python3 \ 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 && \ RUN mkdir -p /usr/share/tessdata && \
cd /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 curl -o /usr/share/tessdata/spa.traineddata https://raw.githubusercontent.com/tesseract-ocr/tessdata/master/spa.traineddata
# sist2 # sist2
COPY --from=build /build/sist2 sist2 COPY --from=build /build/sist2 /root/sist2
# sist2-admin # sist2-admin
COPY sist2-admin/requirements.txt sist2-admin/ COPY sist2-admin/requirements.txt sist2-admin/

2
Dockerfile.arm64
View File

@ -7,7 +7,7 @@ RUN cmake -DSIST_PLATFORM=arm64_linux -DSIST_DEBUG=off -DBUILD_TESTS=off -DCMAKE
RUN make -j$(nproc) RUN make -j$(nproc)
RUN strip sist2 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/* RUN apt update && apt install -y curl libasan5 && rm -rf /var/lib/apt/lists/*

2
sist2-admin/frontend/src/i18n/messages.js
View File

@ -42,8 +42,6 @@ export default {
runJobConfirmationTitle: "Task queued", runJobConfirmationTitle: "Task queued",
runJobConfirmation: "Check the Tasks page to monitor the status.", runJobConfirmation: "Check the Tasks page to monitor the status.",
monitoring: "Monitoring",
enableMonitoring: "Enable monitoring",
extraQueryArgs: "Extra query arguments when launching from sist2-admin", extraQueryArgs: "Extra query arguments when launching from sist2-admin",
customUrl: "Custom URL when launching from sist2-admin", customUrl: "Custom URL when launching from sist2-admin",

4
sist2-admin/frontend/src/views/Frontend.vue
View File

@ -33,10 +33,6 @@
{{ $t("autoStart") }} {{ $t("autoStart") }}
</b-form-checkbox> </b-form-checkbox>
<b-form-checkbox v-model="frontend.enable_monitoring" @change="update()">
{{ $t("enableMonitoring") }}
</b-form-checkbox>
<label>{{ $t("extraQueryArgs") }}</label> <label>{{ $t("extraQueryArgs") }}</label>
<b-form-input v-model="frontend.extra_query_args" @change="update()"></b-form-input> <b-form-input v-model="frontend.extra_query_args" @change="update()"></b-form-input>

4
sist2-admin/sist2_admin/sist2.py
View File

@ -251,7 +251,7 @@ class Sist2:
@staticmethod @staticmethod
def _consume_logs_stderr(logs_cb, proc): def _consume_logs_stderr(logs_cb, proc):
pipe_wrapper = TextIOWrapper(proc.stderr, encoding="utf8") pipe_wrapper = TextIOWrapper(proc.stderr, encoding="utf8", errors="ignore")
try: try:
for line in pipe_wrapper: for line in pipe_wrapper:
if line.strip() == "": if line.strip() == "":
@ -263,7 +263,7 @@ class Sist2:
@staticmethod @staticmethod
def _consume_logs_stdout(logs_cb, proc): def _consume_logs_stdout(logs_cb, proc):
pipe_wrapper = TextIOWrapper(proc.stdout, encoding="utf8") pipe_wrapper = TextIOWrapper(proc.stdout, encoding="utf8", errors="ignore")
try: try:
for line in pipe_wrapper: for line in pipe_wrapper:
if line.strip() == "": if line.strip() == "":

1
sist2-admin/sist2_admin/web.py
View File

@ -13,7 +13,6 @@ class Sist2Frontend(BaseModel):
running: bool = False running: bool = False
auto_start: bool = False auto_start: bool = False
enable_monitoring: bool = True
extra_query_args: str = "" extra_query_args: str = ""
custom_url: str = None custom_url: str = None