diff --git a/.docker/test-kimai-version.sh b/.docker/test-kimai-version.sh deleted file mode 100755 index dc75d3a2..00000000 --- a/.docker/test-kimai-version.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh - -# An reg wizard can probably do this without the cut command -VER=$(echo $KIMAI | sed 's/[^0-9]//g' | cut -c1-3) - -if test "${VER}" -lt 111 -then - echo "+--------------------------------------------------------------------------+" - echo "| Kimai versions older than 1.11 require composer 1.x |" - echo "| To build older versions you'll need to use a tagged version of this repo |" - echo "| https://github.com/tobybatch/kimai2/releases/tag/EOL-composer-1.x |" - echo "| |" - echo "| See https://github.com/tobybatch/kimai2/issues/180 |" - echo "+--------------------------------------------------------------------------+" - return 1 -fi - diff --git a/Dockerfile b/Dockerfile index d455ca34..f4adcd3e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,8 @@ -# _ ___ _ ____ -# | |/ (_)_ __ ___ __ _(_)___ \ -# | ' /| | '_ ` _ \ / _` | | __) | -# | . \| | | | | | | (_| | |/ __/ -# |_|\_\_|_| |_| |_|\__,_|_|_____| +# _ ___ _ +# | |/ (_)_ __ ___ __ _(_) +# | ' /| | '_ ` _ \ / _` | | +# | . \| | | | | | | (_| | | +# |_|\_\_|_| |_| |_|\__,_|_| # # Source base [fpm/apache] @@ -23,9 +23,6 @@ FROM alpine:latest AS git-dev # pass-through Arguments in every stage. See: https://benkyriakou.com/posts/docker-args-empty ARG KIMAI ARG TIMEZONE -# I need to do this check somewhere, we discard all but the checkout so doing here doesn't hurt -ADD .docker/test-kimai-version.sh /test-kimai-version.sh -RUN /test-kimai-version.sh RUN apk add --no-cache git && \ git clone --depth 1 --branch ${KIMAI} https://github.com/kimai/kimai.git /opt/kimai