From b6c032921dbda8d78bf091a927f3ffb15ab19011 Mon Sep 17 00:00:00 2001 From: m1k1o Date: Thu, 1 Apr 2021 21:12:32 +0200 Subject: [PATCH] bugfix. --- .m1k1o/build | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/.m1k1o/build b/.m1k1o/build index 1a5f6fa0..9952f6d3 100755 --- a/.m1k1o/build +++ b/.m1k1o/build @@ -21,30 +21,24 @@ build_server() { } build() { - IMAGE="${IMAGE}:$1" - echo "Building $IMAGE" - if [ "$1" = "base" ] then # build base - docker build -t "${IMAGE}" -f base/Dockerfile "${BASE}" + docker build -t "${IMAGE}:base" -f base/Dockerfile "${BASE}" else # buld image - docker build -t "${IMAGE}" -f "$1/Dockerfile" "$1/" + docker build -t "${IMAGE}:$1" -f "$1/Dockerfile" "$1/" fi } build_arm() { - IMAGE="${IMAGE}:arm-$1" - echo "Building (arm) $IMAGE" - if [ "$1" = "base" ] then # build ARM base - docker build -t "${IMAGE}" -f arm-base/Dockerfile "${BASE}" + docker build -t "${IMAGE}:arm-base" -f arm-base/Dockerfile "${BASE}" else # buld ARM image - docker build -t "${IMAGE}" --build-arg="BASE_IMAGE=${IMAGE}:arm-base" -f "$1/Dockerfile" "$1/" + docker build -t "${IMAGE}:arm-$1" --build-arg="BASE_IMAGE=${IMAGE}:arm-base" -f "$1/Dockerfile" "$1/" fi }