From 819635babc69f7df7f5bb7a796ec4cebbe169d42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20M=C3=BCnchow?= Date: Thu, 29 Aug 2019 22:28:39 +0200 Subject: [PATCH] updated alpine to 3.10 --- alpine/Dockerfile | 2 +- alpine/entrypoint.sh | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/alpine/Dockerfile b/alpine/Dockerfile index b97c45d..63c6034 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.7 +FROM alpine:3.10 RUN apk add --no-cache ca-certificates libstdc++ su-exec RUN set -eux; \ diff --git a/alpine/entrypoint.sh b/alpine/entrypoint.sh index 80ac7dd..b27bbe6 100755 --- a/alpine/entrypoint.sh +++ b/alpine/entrypoint.sh @@ -33,8 +33,12 @@ file_env() { val="$(cat "${fileVarValue}")" fi export "$var"="$val" - unset "$fileVar" - unset "$fileVarValue" + if [ "${fileVar:-}" ]; then + unset "$fileVar" + fi + if [ "${fileVarValue:-}" ]; then + unset "$fileVarValue" + fi } if [ "$1" = 'ts3server' ]; then