Merge pull request #583 from zebrunner/develop

2.5
zebrunner · May 29, 2024 · bcf76cf · bcf76cf
2 parents 606a271 + 6696261
commit bcf76cf
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 88 deletions.
diff --git a/README.md b/README.md
@@ -29,9 +29,9 @@ Enjoy using Zebrunner Reporting in your testing process! Feel free to support th
 
 ## Software requirements
 
-* Install docker ([Ubuntu 16.04](https://www.digitalocean.com/community/tutorials/how-to-install-and-use-docker-on-ubuntu-16-04), [Ubuntu 18.04](https://www.digitalocean.com/community/tutorials/how-to-install-and-use-docker-on-ubuntu-18-04), [Ubuntu 20.04](https://www.digitalocean.com/community/tutorials/how-to-install-and-use-docker-on-ubuntu-20-04), [Amazon Linux 2](https://docs.aws.amazon.com/AmazonECS/latest/developerguide/docker-basics.html), [Redhat/Cent OS](https://www.cyberciti.biz/faq/install-use-setup-docker-on-rhel7-centos7-linux/))
-  
-* Install [docker-composer](https://docs.docker.com/compose/install/#install-compose) 1.25.5+
+* Installed Docker v19+
+
+* Installed Docker compose plugin v2.20.3+
 
 * Install git 2.20.0+
 

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,8 +1,7 @@
-version: '3.7'
 networks:
   default:
-    external:
-      name: infra
+    name: infra
+    external: true
 services:
   nginx:
     image: "nginx:${TAG_NGINX}"

diff --git a/docs/faq.md b/docs/faq.md
diff --git a/jenkins b/jenkins
diff --git a/mcloud b/mcloud
diff --git a/reporting b/reporting
diff --git a/selenoid b/selenoid
diff --git a/sonarqube b/sonarqube
diff --git a/zebrunner.sh b/zebrunner.sh
@@ -15,6 +15,10 @@
   setup() {
     print_banner
 
+    if [ "$1" == "-d" ]; then
+      set -x
+    fi
+
     # load default interactive installer settings
     # shellcheck disable=SC1091
     source backup/settings.env.original
@@ -234,7 +238,7 @@
     sonarqube/zebrunner.sh shutdown
     mcloud/zebrunner.sh shutdown
     selenoid/zebrunner.sh shutdown
-    docker-compose down -v
+    docker compose down -v
 
     rm -f NOTICE.txt
     rm -f .env
@@ -281,7 +285,7 @@
     reporting/zebrunner.sh start
     sonarqube/zebrunner.sh start
 
-    docker-compose up -d
+    docker compose up -d
   }
 
   stop() {
@@ -296,7 +300,7 @@
     sonarqube/zebrunner.sh stop
     mcloud/zebrunner.sh stop
     selenoid/zebrunner.sh stop
-    docker-compose stop
+    docker compose stop
   }
 
   restart() {
@@ -322,7 +326,7 @@
     sonarqube/zebrunner.sh down
     mcloud/zebrunner.sh down
     selenoid/zebrunner.sh down
-    docker-compose down
+    docker compose down
   }
 
   backup() {
@@ -628,7 +632,7 @@
       Flags:
           --help | -h    Print help
       Arguments:
-          setup          Setup Zebrunner Community Edition
+          setup [-d]     Setup Zebrunner Community Edition ('-d' - debug mode)
       	  start          Start container
       	  stop           Stop and keep container
       	  restart        Restart container
@@ -651,7 +655,7 @@ source reporting/patch/settings.sh
 
 case "$1" in
     setup)
-        setup
+        setup "$2"
         ;;
     start)
 	start
+2 −2		.env.original
+5 −5		README.md
+2 −5		docker-compose.yml
+4 −4		zebrunner.sh
+3 −4		docker-compose.yml
+1 −1		minio-storage
+4 −4		zebrunner.sh
+2 −2		.env.original
+2 −3		docker-compose.yml
+4 −4		zebrunner.sh
+42 −1		README.md
+2 −3		docker-compose.yml
+4 −4		zebrunner.sh