From a63e6be54b70ef7fbbe1eb150164fde99057ea6b Mon Sep 17 00:00:00 2001 From: zefie Date: Fri, 13 Aug 2021 01:53:39 -0400 Subject: [PATCH] update docker files --- docker-compose/minisrv/Dockerfile | 4 ++-- docker-compose/minisrv/run.sh | 9 ++++++++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/docker-compose/minisrv/Dockerfile b/docker-compose/minisrv/Dockerfile index 547cefc5..919866f5 100644 --- a/docker-compose/minisrv/Dockerfile +++ b/docker-compose/minisrv/Dockerfile @@ -1,13 +1,13 @@ FROM node:current-alpine -RUN apk add git +RUN apk add git bash RUN npm install -g npm@latest 2>/dev/null > /dev/null RUN cd /opt && git clone --depth=1 https://github.com/zefie/zefie_wtvp_minisrv.git minisrv RUN cd /opt/minisrv && git config pull.ff only RUN cd /opt/minisrv/zefie_wtvp_minisrv && npm install COPY ./run.sh /opt/minisrv/zefie_wtvp_minisrv/run.sh -RUN chmod +x /opt/minisrv/zefie_wtvp_minisrv/run.sh +RUN chmod 755 /opt/minisrv/zefie_wtvp_minisrv/run.sh WORKDIR /opt/minisrv/zefie_wtvp_minisrv CMD ./run.sh diff --git a/docker-compose/minisrv/run.sh b/docker-compose/minisrv/run.sh index bb23bcbf..a4e11ee2 100644 --- a/docker-compose/minisrv/run.sh +++ b/docker-compose/minisrv/run.sh @@ -1,3 +1,10 @@ -#!/bin/sh +#!/bin/bash + +do_exit() { + exit 1 +} +trap do_exit SIGINT +trap do_exit SIGTERM + git pull npm start