diff options
| author | Louis Burda <quent.burda@gmail.com> | 2021-05-29 14:24:31 +0200 |
|---|---|---|
| committer | Louis Burda <quent.burda@gmail.com> | 2021-05-29 14:24:31 +0200 |
| commit | 13b65f01132c41be9ab8d9f92c2c5ca605c366d8 (patch) | |
| tree | 74bd5b4dee779e4600d416adf4abcd4f621addab /service/container | |
| parent | 62d99253144a14648c4da1c2a60c01e7b06ef02c (diff) | |
| download | enowars5-service-stldoctor-13b65f01132c41be9ab8d9f92c2c5ca605c366d8.tar.gz enowars5-service-stldoctor-13b65f01132c41be9ab8d9f92c2c5ca605c366d8.zip | |
changed repo structure and commited releease files such that default docker-compose worklow commands work in testvm
Diffstat (limited to 'service/container')
| -rw-r--r-- | service/container/.gitignore | 2 | ||||
| -rw-r--r-- | service/container/Dockerfile | 22 | ||||
| -rw-r--r-- | service/container/cleaner.sh | 24 | ||||
| -rw-r--r-- | service/container/data/lastclean | 0 | ||||
| -rw-r--r-- | service/container/docker-compose.yml | 8 | ||||
| -rwxr-xr-x | service/container/entrypoint.sh | 13 |
6 files changed, 0 insertions, 69 deletions
diff --git a/service/container/.gitignore b/service/container/.gitignore deleted file mode 100644 index 8156e3e..0000000 --- a/service/container/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -src/ -data/ diff --git a/service/container/Dockerfile b/service/container/Dockerfile deleted file mode 100644 index c932e66..0000000 --- a/service/container/Dockerfile +++ /dev/null @@ -1,22 +0,0 @@ -FROM ubuntu:18.04 - -RUN apt update && apt install -y --no-install-recommends socat build-essential - -RUN addgroup --system service -RUN adduser --system --ingroup service --uid 1000 service - -COPY entrypoint.sh / -RUN chmod 755 /entrypoint.sh - -COPY cleaner.sh / -RUN chmod 755 /cleaner.sh - -COPY src/ /service/ - -WORKDIR /service/ -RUN make clean && make - -EXPOSE 9000 -ENV RESULTDIR=/data/uploads - -ENTRYPOINT ["/entrypoint.sh"] diff --git a/service/container/cleaner.sh b/service/container/cleaner.sh deleted file mode 100644 index bd67705..0000000 --- a/service/container/cleaner.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh - -timeref="/data/lastclean" - -if [ -z "$RESULTDIR" ]; then - echo "RESULTDIR is undefined! skipping cleanup.." - exit 1 -fi - -if [ -f "$timeref" ]; then - files="$(find "$RESULTDIR" -mindepth 1 \! -newer "$timeref")" - echo "$files" | while read path; do - rm -rf "$path" - done - 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/data/lastclean b/service/container/data/lastclean deleted file mode 100644 index e69de29..0000000 --- a/service/container/data/lastclean +++ /dev/null diff --git a/service/container/docker-compose.yml b/service/container/docker-compose.yml deleted file mode 100644 index 1da888f..0000000 --- a/service/container/docker-compose.yml +++ /dev/null @@ -1,8 +0,0 @@ -version: '3' -services: - printdoc: - build: . - volumes: - - ./data/:/data:rw - ports: - - 9090:9000 diff --git a/service/container/entrypoint.sh b/service/container/entrypoint.sh deleted file mode 100755 index b7b6509..0000000 --- a/service/container/entrypoint.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh - -mkdir -p "$RESULTDIR" -chown -R service:service "$RESULTDIR" - -while [ 1 ]; do - /cleaner.sh - sleep 200 -done & - -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 |