From a932f4ae0da7727f59d4a7c4746cb5ce88a730e3 Mon Sep 17 00:00:00 2001 From: rjshrjndrn Date: Thu, 15 Feb 2024 17:28:59 +0100 Subject: [PATCH] chore(docker): support arch build Signed-off-by: rjshrjndrn --- frontend/build.sh | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/frontend/build.sh b/frontend/build.sh index 1e628be98..21c6c02c0 100644 --- a/frontend/build.sh +++ b/frontend/build.sh @@ -8,6 +8,8 @@ # Example # Usage: IMAGE_TAG=latest DOCKER_REPO=myDockerHubID bash build.sh +ARCH=${ARCH:-amd64} + git_sha=$(git rev-parse --short HEAD) image_tag=${IMAGE_TAG:-$git_sha} check_prereq() { @@ -20,31 +22,31 @@ check_prereq() { chart=frontend [[ $1 == ee ]] && ee=true [[ $PATCH -eq 1 ]] && { - __app_version="$(grep -ER ^.ppVersion ../scripts/helmcharts/openreplay/charts/${chart} | xargs | awk '{print $2}' | awk -F. -v OFS=. '{$NF += 1 ; print}' | cut -d 'v' -f2)" - sed -i "s/^VERSION = .*/VERSION = $__app_version/g" .env.sample - image_tag="v${__app_version}" - [[ $ee == "true" ]] && { - image_tag="${image_tag}-ee" - } + __app_version="$(grep -ER ^.ppVersion ../scripts/helmcharts/openreplay/charts/${chart} | xargs | awk '{print $2}' | awk -F. -v OFS=. '{$NF += 1 ; print}' | cut -d 'v' -f2)" + sed -i "s/^VERSION = .*/VERSION = $__app_version/g" .env.sample + image_tag="v${__app_version}" + [[ $ee == "true" ]] && { + image_tag="${image_tag}-ee" + } } update_helm_release() { - [[ $ee == true ]] && return - HELM_TAG="$(grep -iER ^version ../scripts/helmcharts/openreplay/charts/$chart | awk '{print $2}' | awk -F. -v OFS=. '{$NF += 1 ; print}')" - # Update the chart version - sed -i "s#^version.*#version: $HELM_TAG# g" ../scripts/helmcharts/openreplay/charts/$chart/Chart.yaml - # Update image tags - sed -i "s#ppVersion.*#ppVersion: \"v${__app_version}\"#g" ../scripts/helmcharts/openreplay/charts/$chart/Chart.yaml - # Commit the changes - git add .env.sample - git add ../scripts/helmcharts/openreplay/charts/$chart/Chart.yaml - git commit -m "chore(helm): Updating $chart image release" + [[ $ee == true ]] && return + HELM_TAG="$(grep -iER ^version ../scripts/helmcharts/openreplay/charts/$chart | awk '{print $2}' | awk -F. -v OFS=. '{$NF += 1 ; print}')" + # Update the chart version + sed -i "s#^version.*#version: $HELM_TAG# g" ../scripts/helmcharts/openreplay/charts/$chart/Chart.yaml + # Update image tags + sed -i "s#ppVersion.*#ppVersion: \"v${__app_version}\"#g" ../scripts/helmcharts/openreplay/charts/$chart/Chart.yaml + # Commit the changes + git add .env.sample + git add ../scripts/helmcharts/openreplay/charts/$chart/Chart.yaml + git commit -m "chore(helm): Updating $chart image release" } # https://github.com/docker/cli/issues/1134#issuecomment-613516912 export DOCKER_BUILDKIT=1 -function build(){ +function build() { # Run docker as the same user, else we'll run in to permission issues. - docker build -t ${DOCKER_REPO:-'local'}/frontend:${image_tag} --platform linux/amd64 --build-arg GIT_SHA=$git_sha . + docker build -t ${DOCKER_REPO:-'local'}/frontend:${image_tag} --platform linux/${ARCH} --build-arg GIT_SHA=$git_sha . [[ $PUSH_IMAGE -eq 1 ]] && { docker push ${DOCKER_REPO:-'local'}/frontend:${image_tag} }