Cleaned up the run and oc-setup scripts

tqvarnst · Nov 22, 2019 · 0f00b60 · 0f00b60
1 parent 57299d7
commit 0f00b60
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 28 deletions.
diff --git a/src/main/scripts/oc-setup.sh b/src/main/scripts/oc-setup.sh
@@ -103,7 +103,7 @@ function create_postgresql_in_project {
   oc new-app -e POSTGRESQL_USER=todo -e POSTGRESQL_PASSWORD=todo -e POSTGRESQL_DATABASE=todo-db postgresql -e POSTGRESQL_MAX_CONNECTIONS=400 -n $1 >/dev/null
 }
 
-function start-todo-app {
+function start_todo_app {
   local namespace=$1
   shift
   local env="$*"
@@ -116,7 +116,7 @@ function start-todo-app {
 
 }
 
-fuction scale-todo-app {
+function scale_todo_app {
   local namespace=$1
   local size=$2
   oc scale --replicas=${size} dc todo -n ${namespace} > /dev/null
@@ -156,13 +156,13 @@ tag_and_upload_image ${spring_local_image_name} "${REGISTRY_ROUTE}/${spring_pod_
 tag_and_upload_image ${quarkus_jvm_local_image_name} "${REGISTRY_ROUTE}/${quarkus_jvm_pod_image}"
 tag_and_upload_image ${quarkus_native_local_image_name} "${REGISTRY_ROUTE}/${quarkus_native_pod_image}"
 
-start-todo-app ${spring_project} -e SPRING_DATASOURCE_URL=jdbc:postgresql://postgresql/todo-db -e SPRING_HTTP_PORT=8080
-start-todo-app ${quarkus_jvm_project} -e QUARKUS_DATASOURCE_URL=jdbc:postgresql://postgresql/todo-db -e QUARKUS_HTTP_PORT=8080
-start-todo-app ${quarkus_native_project} -e QUARKUS_DATASOURCE_URL=jdbc:postgresql://postgresql/todo-db -e QUARKUS_HTTP_PORT=8080
+start_todo_app ${spring_project} -e SPRING_DATASOURCE_URL=jdbc:postgresql://postgresql/todo-db -e SPRING_HTTP_PORT=8080
+start_todo_app ${quarkus_jvm_project} -e QUARKUS_DATASOURCE_URL=jdbc:postgresql://postgresql/todo-db -e QUARKUS_HTTP_PORT=8080
+start_todo_app ${quarkus_native_project} -e QUARKUS_DATASOURCE_URL=jdbc:postgresql://postgresql/todo-db -e QUARKUS_HTTP_PORT=8080
 
-scale-todo-app ${spring_project} 10
-scale-todo-app ${quarkus_jvm_project} 10
-scale-todo-app ${quarkus_native_project} 10
+scale_todo_app ${spring_project} 10
+scale_todo_app ${quarkus_jvm_project} 10
+scale_todo_app ${quarkus_native_project} 10
 
 
 

diff --git a/src/main/scripts/run.sh b/src/main/scripts/run.sh
@@ -31,6 +31,7 @@ container_quarkus_native_image=quarkus-native/todo
 container_cpu_limit=4
 container_memory_limit=512M
 
+psql_db_host=localhost
 psql_db_name=todo-db
 psql_db_user=todo
 psql_db_password=todo
@@ -44,16 +45,7 @@ if [ "$(uname)" == "Darwin" ]; then
   psql_db_host=${container_db_name}
 fi
 
-if [ $# -eq 1 ]
-  then
-    psql_db_host=$1
-    network_config="--network=${container_network_name}"
-    lab=true
-else
-    psql_db_host=localhost
-    network_config="--network=${container_network_name} -p 5432:5432"
-    lab=false
-fi
+
 
 ############
 ## Functions
@@ -66,7 +58,13 @@ function run_database_script {
 
 function create_database_container {
   printf "Starting PostgreSQL with name ${container_db_name} "
-  ${container_runtime} run --ulimit memlock=-1:-1 -d --rm=true ${network_config} --memory-swappiness=0 --name ${container_db_name} -e POSTGRES_USER=${psql_db_user} -e POSTGRES_PASSWORD=${psql_db_password} -e POSTGRES_DB=${psql_db_name} postgres:10.5 > /dev/null
+  ${container_runtime} run --ulimit memlock=-1:-1 -d --rm=true -p 5432:5432 \
+        --network=${container_network_name} \
+        --memory-swappiness=0 \
+        --name ${container_db_name} \
+        -e POSTGRES_USER=${psql_db_user} \
+        -e POSTGRES_PASSWORD=${psql_db_password} \
+        -e POSTGRES_DB=${psql_db_name} postgres:10.5 > /dev/null
   # Waiting for the database to start
   while ! (${container_runtime} exec -it ${container_db_name} psql -U ${psql_db_user} ${psql_db_name} -c "select 1" > /dev/null 2>&1)
   do
@@ -96,11 +94,14 @@ function create_container {
 
   printf "Starting ${image} container using port ${port} "
 
-  if [ "$lab" = true ] ; then
-    ${container_runtime} run -d --rm --cpus=${container_cpu_limit} --memory=${container_memory_limit} --network=host --name=${name} ${env} ${image} > /dev/null
-  else
-    ${container_runtime} run -d --rm --cpus=${container_cpu_limit} --memory=${container_memory_limit} -p ${port}:${port} --network=${container_network_name} --name=${name} ${env} ${image} > /dev/null
-  fi
+  ${container_runtime} run -d --rm \
+          --cpus=${container_cpu_limit} \
+          --memory=${container_memory_limit} \
+          -p ${port}:${port} \
+          --network=${container_network_name} \
+          --name=${name} \
+          ${env} \
+          ${image} > /dev/null
 
   while ! (curl -sf http://localhost:${port}/api > /dev/null)
   do
@@ -118,10 +119,9 @@ printf "Creating network for containers "
 ${container_runtime} network create ${container_network_name} > /dev/null 2>&1 || true
 echo "[DONE]"
 
-if [ "$lab" != true ] ; then
-  create_database_container   ${container_db_name}
-  prepopulate_database        ${container_db_name}
-fi
+
+create_database_container   ${container_db_name}
+prepopulate_database        ${container_db_name}
 
 # Starting the cloud native runtime and wait for first response
 create_container ${container_spring_name} ${container_spring_image} ${container_spring_port} -e SPRING_HTTP_PORT=${container_spring_port} -e SPRING_DATASOURCE_URL=jdbc:postgresql://${psql_db_host}/${psql_db_name}