From ded23123d07c6fbea6594d6fba8a30a0c9379fa2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20=C5=BBelazko?= Date: Thu, 22 Feb 2024 17:46:50 +0100 Subject: [PATCH] chore: update localenv builder script --- localenv/scripts/images.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/localenv/scripts/images.sh b/localenv/scripts/images.sh index be3acc3031..e96460c7f4 100755 --- a/localenv/scripts/images.sh +++ b/localenv/scripts/images.sh @@ -12,7 +12,7 @@ create_tmp_dockerfile(){ service="${1}" tmp_dockerfile=$(mktemp -t "octant-dockerfile-${service}.XXXXXXXX") - sed "s/local-docker-registry.wildland.dev\///g" "${OCTANT_ROOT}/ci/Dockerfile.${service}" >$tmp_dockerfile + sed "s/local-docker-registry.wildland.dev:80\///g" "${OCTANT_ROOT}/ci/Dockerfile.${service}" >$tmp_dockerfile echo $tmp_dockerfile } @@ -22,8 +22,9 @@ build_image(){ image=$1 dockerfile=$2 context_dir=$3 + darwin_arm_args=$(if [[ $(uname -m) == 'arm64' ]]; then echo --platform linux/amd64 ; fi) - image_id=$(docker build -q --tag "${DOCKER_IMAGE_PREFIX}/${image}:${DOCKER_TAG}" -f ${dockerfile} "${context_dir}") + image_id=$(docker build ${darwin_arm_args} -q --tag "${DOCKER_IMAGE_PREFIX}/${image}:${DOCKER_TAG}" -f ${dockerfile} "${context_dir}") echo "Created ${image} image ${image_id}" }