From dc40c3461ada0fd8bcc0752af022fa4504f30491 Mon Sep 17 00:00:00 2001 From: sh <37271604+shumvgolove@users.noreply.github.com> Date: Sun, 23 Apr 2023 17:29:19 +0300 Subject: [PATCH] docker: fix docker logs and add build arg (#733) --- download.Dockerfile | 2 ++ scripts/docker/entrypoint | 7 +++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/download.Dockerfile b/download.Dockerfile index 48344c376..55d79c29f 100644 --- a/download.Dockerfile +++ b/download.Dockerfile @@ -3,6 +3,8 @@ FROM ubuntu:focal # Install curl RUN apt-get update && apt-get install -y curl +ARG version=undefined + # Download latest smp-server release and assign executable permission RUN curl -L https://github.com/simplex-chat/simplexmq/releases/latest/download/smp-server-ubuntu-20_04-x86-64 -o /usr/bin/smp-server && \ chmod +x /usr/bin/smp-server diff --git a/scripts/docker/entrypoint b/scripts/docker/entrypoint index cc9f1dc13..ad3a5f6c8 100755 --- a/scripts/docker/entrypoint +++ b/scripts/docker/entrypoint @@ -20,10 +20,9 @@ if [ ! -f "$confd/smp-server.ini" ]; then fi # backup store log -[ -f "$logd/smp-server-store.log" ] && cp "$logd"/smp-server-store.log "$logd"/smp-server-store.log.bak -# rotate server log -[ -f "$logd/smp-server.log" ] && mv "$logd"/smp-server.log "$logd"/smp-server-"$(date +'%FT%T')".log +[ -f "$logd/smp-server-store.log" ] && cp "$logd"/smp-server-store.log "$logd"/smp-server-store.log."$(date +'%FT%T')" # Finally, run smp-sever. Notice that "exec" here is important: # smp-server replaces our helper script, so that it can catch INT signal -exec smp-server start > "$logd"/smp-server.log 2>&1 +exec smp-server start +