From 09d376da08d50291ebc711740adf3cd5ed530eee Mon Sep 17 00:00:00 2001
From: Taha Yassine Kraiem <tahayk2@gmail.com>
Date: Mon, 14 Nov 2022 16:02:18 +0100
Subject: [PATCH] feat(alerts): changed build script feat(crons): changed build
 script feat(alerts): changed build script

---
 api/{.dockerignore => Dockerfile.dockerignore}  |  0
 api/{Dockerfile.alerts => Dockerfile_alerts}    |  0
 ...kerignore => Dockerfile_alerts.dockerignore} |  0
 api/{Dockerfile.bundle => Dockerfile_bundle}    |  0
 api/build.sh                                    | 12 +++++++++---
 api/build_alerts.sh                             | 17 +++++++++++------
 .../{.dockerignore => Dockerfile.dockerignore}  |  0
 ee/api/{Dockerfile.alerts => Dockerfile_alerts} |  0
 ...kerignore => Dockerfile_alerts.dockerignore} |  0
 ee/api/{Dockerfile.crons => Dockerfile_crons}   |  0
 ...ckerignore => Dockerfile_crons.dockerignore} |  0
 ee/api/build_crons.sh                           | 15 ++++++++-------
 12 files changed, 28 insertions(+), 16 deletions(-)
 rename api/{.dockerignore => Dockerfile.dockerignore} (100%)
 rename api/{Dockerfile.alerts => Dockerfile_alerts} (100%)
 rename api/{Dockerfile.alerts.dockerignore => Dockerfile_alerts.dockerignore} (100%)
 rename api/{Dockerfile.bundle => Dockerfile_bundle} (100%)
 rename ee/api/{.dockerignore => Dockerfile.dockerignore} (100%)
 rename ee/api/{Dockerfile.alerts => Dockerfile_alerts} (100%)
 rename ee/api/{Dockerfile.alerts.dockerignore => Dockerfile_alerts.dockerignore} (100%)
 rename ee/api/{Dockerfile.crons => Dockerfile_crons} (100%)
 rename ee/api/{Dockerfile.crons.dockerignore => Dockerfile_crons.dockerignore} (100%)

diff --git a/api/.dockerignore b/api/Dockerfile.dockerignore
similarity index 100%
rename from api/.dockerignore
rename to api/Dockerfile.dockerignore
diff --git a/api/Dockerfile.alerts b/api/Dockerfile_alerts
similarity index 100%
rename from api/Dockerfile.alerts
rename to api/Dockerfile_alerts
diff --git a/api/Dockerfile.alerts.dockerignore b/api/Dockerfile_alerts.dockerignore
similarity index 100%
rename from api/Dockerfile.alerts.dockerignore
rename to api/Dockerfile_alerts.dockerignore
diff --git a/api/Dockerfile.bundle b/api/Dockerfile_bundle
similarity index 100%
rename from api/Dockerfile.bundle
rename to api/Dockerfile_bundle
diff --git a/api/build.sh b/api/build.sh
index ccebccea3..a7abdb877 100644
--- a/api/build.sh
+++ b/api/build.sh
@@ -19,8 +19,12 @@ check_prereq() {
 }
 
 function build_api(){
-    cp -R ../api ../_api
-    cd ../_api
+    destination="_api"
+    [[ $1 == "ee" ]] && {
+        destination="_api_ee"
+    }
+    cp -R ../api ../${destination}
+    cd ../${destination}
     tag=""
     # Copy enterprise code
     [[ $1 == "ee" ]] && {
@@ -28,9 +32,10 @@ function build_api(){
         envarg="default-ee"
         tag="ee-"
     }
+    mv Dockerfile.dockerignore .dockerignore
     docker build -f ./Dockerfile --build-arg envarg=$envarg -t ${DOCKER_REPO:-'local'}/chalice:${git_sha1} .
     cd ../api
-    rm -rf ../_api
+    rm -rf ../${destination}
     [[ $PUSH_IMAGE -eq 1 ]] && {
         docker push ${DOCKER_REPO:-'local'}/chalice:${git_sha1}
         docker tag ${DOCKER_REPO:-'local'}/chalice:${git_sha1} ${DOCKER_REPO:-'local'}/chalice:${tag}latest
@@ -47,4 +52,5 @@ IMAGE_TAG=$IMAGE_TAG PUSH_IMAGE=$PUSH_IMAGE DOCKER_REPO=$DOCKER_REPO bash build_
 [[ $1 == "ee" ]] && {
   cp ../ee/api/build_crons.sh .
   IMAGE_TAG=$IMAGE_TAG PUSH_IMAGE=$PUSH_IMAGE DOCKER_REPO=$DOCKER_REPO bash build_crons.sh $1
+  rm build_crons.sh
 }
diff --git a/api/build_alerts.sh b/api/build_alerts.sh
index 9ab21e6af..a36472a8d 100644
--- a/api/build_alerts.sh
+++ b/api/build_alerts.sh
@@ -16,9 +16,13 @@ check_prereq() {
     }
 }
 
-function build_api(){
-    cp -R ../api ../_alerts
-    cd ../_alerts
+function build_alerts(){
+    destination="_alerts"
+    [[ $1 == "ee" ]] && {
+        destination="_alerts_ee"
+    }
+    cp -R ../api ../${destination}
+    cd ../${destination}
     tag=""
     # Copy enterprise code
     [[ $1 == "ee" ]] && {
@@ -26,9 +30,10 @@ function build_api(){
         envarg="default-ee"
         tag="ee-"
     }
-    docker build -f ./Dockerfile.alerts --build-arg envarg=$envarg -t ${DOCKER_REPO:-'local'}/alerts:${git_sha1} .
+    mv Dockerfile_alerts.dockerignore .dockerignore
+    docker build -f ./Dockerfile_alerts --build-arg envarg=$envarg -t ${DOCKER_REPO:-'local'}/alerts:${git_sha1} .
     cd ../api
-    rm -rf ../_alerts
+    rm -rf ../${destination}
     [[ $PUSH_IMAGE -eq 1 ]] && {
         docker push ${DOCKER_REPO:-'local'}/alerts:${git_sha1}
         docker tag ${DOCKER_REPO:-'local'}/alerts:${git_sha1} ${DOCKER_REPO:-'local'}/alerts:${tag}latest
@@ -38,4 +43,4 @@ function build_api(){
 }
 
 check_prereq
-build_api $1
+build_alerts $1
diff --git a/ee/api/.dockerignore b/ee/api/Dockerfile.dockerignore
similarity index 100%
rename from ee/api/.dockerignore
rename to ee/api/Dockerfile.dockerignore
diff --git a/ee/api/Dockerfile.alerts b/ee/api/Dockerfile_alerts
similarity index 100%
rename from ee/api/Dockerfile.alerts
rename to ee/api/Dockerfile_alerts
diff --git a/ee/api/Dockerfile.alerts.dockerignore b/ee/api/Dockerfile_alerts.dockerignore
similarity index 100%
rename from ee/api/Dockerfile.alerts.dockerignore
rename to ee/api/Dockerfile_alerts.dockerignore
diff --git a/ee/api/Dockerfile.crons b/ee/api/Dockerfile_crons
similarity index 100%
rename from ee/api/Dockerfile.crons
rename to ee/api/Dockerfile_crons
diff --git a/ee/api/Dockerfile.crons.dockerignore b/ee/api/Dockerfile_crons.dockerignore
similarity index 100%
rename from ee/api/Dockerfile.crons.dockerignore
rename to ee/api/Dockerfile_crons.dockerignore
diff --git a/ee/api/build_crons.sh b/ee/api/build_crons.sh
index 810c1b4b5..2f9d84a81 100644
--- a/ee/api/build_crons.sh
+++ b/ee/api/build_crons.sh
@@ -17,19 +17,20 @@ check_prereq() {
     [[ exit -eq 1 ]] && exit 1
 }
 
-function build_api(){
-    cp -R ../api ../_crons
-    cd ../_crons
+function build_crons(){
+    destination="_crons_ee"
+    cp -R ../api ../${destination}
+    cd ../${destination}
     tag=""
     # Copy enterprise code
 
     cp -rf ../ee/api/* ./
     envarg="default-ee"
     tag="ee-"
-
-    docker build -f ./Dockerfile.crons --build-arg envarg=$envarg -t ${DOCKER_REPO:-'local'}/crons:${git_sha1} .
+    mv Dockerfile_crons.dockerignore .dockerignore
+    docker build -f ./Dockerfile_crons --build-arg envarg=$envarg -t ${DOCKER_REPO:-'local'}/crons:${git_sha1} .
     cd ../api
-    rm -rf ../_crons
+    rm -rf ../${destination}
     [[ $PUSH_IMAGE -eq 1 ]] && {
         docker push ${DOCKER_REPO:-'local'}/crons:${git_sha1}
         docker tag ${DOCKER_REPO:-'local'}/crons:${git_sha1} ${DOCKER_REPO:-'local'}/crons:${tag}latest
@@ -39,4 +40,4 @@ function build_api(){
 }
 
 check_prereq
-build_api $1
+build_crons $1