From 991f023b523d1a9e12e580950c48cf1307ea8941 Mon Sep 17 00:00:00 2001 From: Youshaa Murhij Date: Sun, 11 Feb 2024 16:05:53 +0300 Subject: [PATCH] fix build issues --- docker/{Dockerfile.x86_64 => Dockerfile} | 0 docker/build.sh | 23 +++-------------------- 2 files changed, 3 insertions(+), 20 deletions(-) rename docker/{Dockerfile.x86_64 => Dockerfile} (100%) diff --git a/docker/Dockerfile.x86_64 b/docker/Dockerfile similarity index 100% rename from docker/Dockerfile.x86_64 rename to docker/Dockerfile diff --git a/docker/build.sh b/docker/build.sh index 282174d1..9704d909 100644 --- a/docker/build.sh +++ b/docker/build.sh @@ -1,22 +1,5 @@ #!/bin/bash -yellow=`tput setaf 3` -green=`tput setaf 2` -violet=`tput setaf 5` -reset_color=`tput sgr0` - -ARCH="$(uname -m)" - -main () { - pushd "$(dirname "$0")"; - if [ "$ARCH" = "x86_64" ] || [ "$ARCH" = "aarch64" ]; then - file="./Dockerfile.${ARCH}" - else - echo "There is no Dockerfile for ${yellow}${ARCH}${reset_color} arch" - fi - echo "Building image for ${yellow}${ARCH}${reset_color} arch. from Dockerfile: ${yellow}${file}${reset_color}" - docker build -f ${file} . -t ${ARCH}/dagm_mono:latest; - popd; -} - -main "$@"; exit; +docker build . \ + -f Dockerfile/Dockerfile \ + -t x64/fmf:latest