diff options
| author | Louis Burda <quent.burda@gmail.com> | 2021-05-20 02:49:09 +0200 |
|---|---|---|
| committer | Louis Burda <quent.burda@gmail.com> | 2021-05-20 02:49:09 +0200 |
| commit | 1109a88447e1c5cefe6ed93eccc8dcf8cd595d0e (patch) | |
| tree | 6c88ce49e14669527ff7da96ebef44416dc928ff /service/container | |
| parent | ea33a19c447df8cc3748a8b6dc8e45121fdc3570 (diff) | |
| download | enowars5-service-stldoctor-1109a88447e1c5cefe6ed93eccc8dcf8cd595d0e.tar.gz enowars5-service-stldoctor-1109a88447e1c5cefe6ed93eccc8dcf8cd595d0e.zip | |
implemented rest of checker functionality
Diffstat (limited to 'service/container')
| -rw-r--r-- | service/container/.gitignore | 1 | ||||
| -rw-r--r-- | service/container/Dockerfile | 2 | ||||
| -rw-r--r-- | service/container/cleaner.sh | 7 | ||||
| -rwxr-xr-x | service/container/entrypoint.sh | 4 |
4 files changed, 10 insertions, 4 deletions
diff --git a/service/container/.gitignore b/service/container/.gitignore index 8eba6c8..8156e3e 100644 --- a/service/container/.gitignore +++ b/service/container/.gitignore @@ -1 +1,2 @@ src/ +data/ diff --git a/service/container/Dockerfile b/service/container/Dockerfile index e987831..ba6535f 100644 --- a/service/container/Dockerfile +++ b/service/container/Dockerfile @@ -19,6 +19,6 @@ WORKDIR /service/ RUN make clean && make EXPOSE 9000 -ENV RESULTDIR=/data/scans +ENV RESULTDIR=/data/uploads ENTRYPOINT ["/entrypoint.sh"] diff --git a/service/container/cleaner.sh b/service/container/cleaner.sh index 2882608..bd67705 100644 --- a/service/container/cleaner.sh +++ b/service/container/cleaner.sh @@ -12,7 +12,12 @@ if [ -f "$timeref" ]; then echo "$files" | while read path; do rm -rf "$path" done - echo "[ $(date +%T) ] Removed $(echo -n "$files" | wc -l) old files!" + if [ -z "$files" ]; then + filecount=0 + else + filecount=$(echo "$files" | wc -l) + fi + echo "[ $(date +%T) ] Removed $filecount old files!" fi touch "$timeref" diff --git a/service/container/entrypoint.sh b/service/container/entrypoint.sh index 956c747..4974a8f 100755 --- a/service/container/entrypoint.sh +++ b/service/container/entrypoint.sh @@ -6,9 +6,9 @@ mkdir -p "$RESULTDIR" while [ 1 ]; do /cleaner.sh - sleep 180 + sleep 200 done & -servicecmd='socat -T30 -s TCP-LISTEN:9000,reuseaddr,fork EXEC:"/service/stldoctor",raw,pty,echo=0,stderr' +servicecmd='socat -T30 -s TCP-LISTEN:9000,reuseaddr,fork EXEC:"/service/build/stldoctor",raw,pty,echo=0,stderr' su -s /bin/sh -c "$servicecmd" service |