Updated scripts

gardusig · Sep 18, 2024 · 5c742cf · 5c742cf
1 parent 9cd6c1f
commit 5c742cf
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 41 deletions.
diff --git a/design.png b/design.png
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '3'
-
 services:
   db:
     image: postgres:16-alpine

diff --git a/script/cleanup.sh b/script/cleanup.sh
diff --git a/script/lint.sh b/script/lint.sh
@@ -1,7 +1,7 @@
-cleanup_containers() {
-    echo "start cleaning up containers..."
+stop_containers() {
+    echo "starting to stop containers..."
     docker-compose down
-    echo "done cleaning up containers"
+    echo "done stopping containers..."
 }
 
 build_images() {
@@ -18,10 +18,10 @@ run_lint() {
 
 main() {
     set -e
-    cleanup_containers
+    stop_containers
     build_images
     run_lint
-    cleanup_containers
+    stop_containers
 }
 
 main
diff --git a/script/start.sh b/script/start.sh
@@ -1,19 +1,19 @@
 SERVER_LIST="server_0 server_1 server_2"
 
-cleanup_containers() {
-    echo "start cleaning up containers..."
+stop_containers() {
+    echo "starting to stop containers..."
     docker-compose down
-    echo "done cleaning up containers"
+    echo "done stopping containers..."
 }
 
 build_images() {
-    echo "start building images..."
+    echo "starting  to build images..."
     docker-compose build -q
     echo "done building images"
 }
 
 start_database() {
-    echo "start setting up database container..."
+    echo "starting to set up database container..."
     docker-compose up -d --force-recreate db
     sleep 5
     if ! docker-compose ps | grep -q "db"; then
@@ -25,7 +25,7 @@ start_database() {
 }
 
 start_servers() {
-    echo "start setting up server container(s)..."
+    echo "starting to set up server container(s)..."
     for server in $SERVER_LIST; do
         echo "start setting up container: ${server}..."
         docker-compose up -d --force-recreate $server
@@ -56,7 +56,7 @@ start_nginx() {
 
 main() {
     set -e
-    cleanup_containers
+    stop_containers
     build_images
     start_database
     start_servers

diff --git a/script/test.sh b/script/test.sh
@@ -1,7 +1,7 @@
-cleanup_containers() {
-    echo "start cleaning up containers..."
+stop_containers() {
+    echo "starting to stop containers..."
     docker-compose down
-    echo "done cleaning up containers"
+    echo "done stopping containers..."
 }
 
 run_e2e_tests() {
@@ -18,7 +18,7 @@ run_e2e_tests() {
 main() {
     set -e
     run_e2e_tests
-    cleanup_containers
+    stop_containers
 }
 
 main