From 8801741e1230439f3ee88f214d7451f79ca34e46 Mon Sep 17 00:00:00 2001 From: Dmitriy Safronov <zimniy@cyberbrain.pw> Date: Sat, 9 Apr 2022 18:13:35 +0300 Subject: [PATCH] fix --- Dockerfile | 7 ++++--- entrypoint.sh | 9 ++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index 97408c9..e0af654 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,15 @@ ARG DOCKER_REGISTRY=registry.cyberbrain.pw FROM $DOCKER_REGISTRY/tools/docker/ubuntu:latest AS source -COPY entrypoint.sh /entrypoint.sh RUN set -ex && \ - chmod a+x /entrypoint.sh && \ apt-get update -y && \ apt-get install -y --no-install-suggests --no-install-recommends mariadb-client && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* +COPY entrypoint.sh /entrypoint.sh +RUN set -ex && \ + chmod a+x /entrypoint.sh + VOLUME [ "/backup" ] ENTRYPOINT [ "/entrypoint.sh" ] -CMD [ "help" ] diff --git a/entrypoint.sh b/entrypoint.sh index a4cea64..bb7c20d 100644 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -2,17 +2,16 @@ # To/Die/For =) unset TO_DIE -die() { +die () { RED='\033[0;31m' NC='\033[0m' # No Color - echo -e "${RED}$1${NC}" - TO_DIE=1 - + echo "${RED}$1${NC}" + exit 1 } ######################################################################## -backup() { +backup () { # SET VARIABLES # BACKUPDIR="/backup" -- GitLab