jan/openreplay
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/api-v1.11.0' into dev

Browse source 
# Conflicts:
#	api/build.sh
#	api/build_alerts.sh
#	assist/build.sh
#	peers/build.sh
#	sourcemap-reader/build.sh
This commit is contained in:
Taha Yassine Kraiem 2023-03-28 09:45:35 +01:00
commit 75d8499147
5 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
api/build.sh
View file

@ -30,7 +30,7 @@ check_prereq() {
[[ $1 == ee ]] && ee=true
[[ $PATCH -eq 1 ]] && {
image_tag="$(grep -ER ^.ppVersion ../scripts/helmcharts/openreplay/charts/$chart | xargs | awk '{print $2}' | awk -F. -v OFS=. '{$NF += 1 ; print}')"
[[ $ee == "true" ]] && {
[[ $ee == "true" ]] && {
image_tag="${image_tag}-ee"
}
}
@ -78,12 +78,6 @@ function build_api(){
check_prereq
build_api $environment
echo buil_complete
[[ $PATCH -eq 1 ]] && update_helm_release chalice
IMAGE_TAG=$IMAGE_TAG PUSH_IMAGE=$PUSH_IMAGE DOCKER_REPO=$DOCKER_REPO SIGN_IMAGE=$SIGN_IMAGE SIGN_KEY=$SIGN_KEY bash build_alerts.sh $1
[[ $environment == "ee" ]] && {
cp ../ee/api/build_crons.sh .
IMAGE_TAG=$IMAGE_TAG PUSH_IMAGE=$PUSH_IMAGE DOCKER_REPO=$DOCKER_REPO SIGN_IMAGE=$SIGN_IMAGE SIGN_KEY=$SIGN_KEY bash build_crons.sh $1
exit_err $?
rm build_crons.sh
} || true
if [[ $PATCH -eq 1 ]]; then
update_helm_release chalice
fi

8
api/build_alerts.sh
View file

@ -8,7 +8,7 @@
# Usage: IMAGE_TAG=latest DOCKER_REPO=myDockerHubID bash build.sh <ee>
git_sha=$(git rev-parse --short HEAD)
image_tag=${IMAGE_TAG:-$git_sha}
image_tag=${IMAGE_TAG:-git_sha}
envarg="default-foss"
check_prereq() {
which docker || {
@ -21,7 +21,7 @@ check_prereq() {
[[ $1 == ee ]] && ee=true
[[ $PATCH -eq 1 ]] && {
image_tag="$(grep -ER ^.ppVersion ../scripts/helmcharts/openreplay/charts/$chart | xargs | awk '{print $2}' | awk -F. -v OFS=. '{$NF += 1 ; print}')"
[[ $ee == "true" ]] && {
[[ $ee == "true" ]] && {
image_tag="${image_tag}-ee"
}
}
@ -68,4 +68,6 @@ function build_alerts(){
check_prereq
build_alerts $1
[[ $PATCH -eq 1 ]] && update_helm_release alerts
if [[ $PATCH -eq 1 ]]; then
update_helm_release alerts
fi

6
assist/build.sh
View file

@ -18,7 +18,7 @@ check_prereq() {
[[ $1 == ee ]] && ee=true
[[ $PATCH -eq 1 ]] && {
image_tag="$(grep -ER ^.ppVersion ../scripts/helmcharts/openreplay/charts/$chart | xargs | awk '{print $2}' | awk -F. -v OFS=. '{$NF += 1 ; print}')"
[[ $ee == "true" ]] && {
[[ $ee == "true" ]] && {
image_tag="${image_tag}-ee"
}
}
@ -63,4 +63,6 @@ function build_api(){
check_prereq
build_api $1
[[ $PATCH -eq 1 ]] && update_helm_release assist
if [[ $PATCH -eq 1 ]]; then
update_helm_release assist
fi

4
peers/build.sh
View file

@ -18,7 +18,7 @@ check_prereq() {
[[ $1 == ee ]] && ee=true
[[ $PATCH -eq 1 ]] && {
image_tag="$(grep -ER ^.ppVersion ../scripts/helmcharts/openreplay/charts/$chart | xargs | awk '{print $2}' | awk -F. -v OFS=. '{$NF += 1 ; print}')"
[[ $ee == "true" ]] && {
[[ $ee == "true" ]] && {
image_tag="${image_tag}-ee"
}
}
@ -63,5 +63,5 @@ function build_api(){
check_prereq
build_api $1
if [[ $PATCH -eq 1 ]]; then
update_helm_release peers
update_helm_release peers
fi

8
sourcemap-reader/build.sh
View file

@ -11,7 +11,7 @@ set -e
image_name="sourcemaps-reader"
git_sha=$(git rev-parse --short HEAD)
image_tag=${IMAGE_TAG:-$git_sha}
image_tag=${IMAGE_TAG:-git_sha}
envarg="default-foss"
check_prereq() {
@ -25,7 +25,7 @@ check_prereq() {
[[ $1 == ee ]] && ee=true
[[ $PATCH -eq 1 ]] && {
image_tag="$(grep -ER ^.ppVersion ../scripts/helmcharts/openreplay/charts/$chart | xargs | awk '{print $2}' | awk -F. -v OFS=. '{$NF += 1 ; print}')"
[[ $ee == "true" ]] && {
[[ $ee == "true" ]] && {
image_tag="${image_tag}-ee"
}
}
@ -73,4 +73,6 @@ function build_api(){
check_prereq
build_api $1
echo buil_complete
[[ $PATCH -eq 1 ]] && update_helm_release sourcemapreader
if [[ $PATCH -eq 1 ]]; then
update_helm_release sourcemapreader
fi