From 5931123bb314dbf7503ceafadffdc80434a6010b Mon Sep 17 00:00:00 2001 From: m1k1o Date: Sat, 3 Apr 2021 13:56:41 +0200 Subject: [PATCH] arm build with common dockerfile. --- .m1k1o/build | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/.m1k1o/build b/.m1k1o/build index 4a484c2..e084846 100755 --- a/.m1k1o/build +++ b/.m1k1o/build @@ -43,7 +43,7 @@ build() { # build base docker build -t "${BUILD_IMAGE}:base" -f base/Dockerfile "${BASE}" else - # buld image + # build image docker build -t "${BUILD_IMAGE}:$1" --build-arg="BASE_IMAGE=${BUILD_IMAGE}:base" -f "$1/Dockerfile" "$1/" fi } @@ -53,9 +53,13 @@ build_arm() { then # build ARM base docker build -t "${BUILD_IMAGE}:arm-base" -f base/Dockerfile.arm "${BASE}" - else - # buld ARM image + elif [ -f "$1/Dockerfile.arm" ] + then + # build dedicated ARM image docker build -t "${BUILD_IMAGE}:arm-$1" --build-arg="BASE_IMAGE=${BUILD_IMAGE}:arm-base" -f "$1/Dockerfile.arm" "$1/" + else + # try to build ARM image with common Dockerfile + docker build -t "${BUILD_IMAGE}:arm-$1" --build-arg="BASE_IMAGE=${BUILD_IMAGE}:arm-base" -f "$1/Dockerfile" "$1/" fi }