diff --git a/README.md b/README.md index cc5d1ee7..e7817a17 100644 --- 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 index 7cf15bd0..fc016957 100644 --- 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 deleted file mode 100644 index 87f8271a..00000000 --- a/docs/faq.md +++ /dev/null @@ -1,71 +0,0 @@ -# F.A.Q (Draft) - -## Ferox educta - -Lorem markdownum ramos, dura suadet Eumenides pudet; et non vultus dixit -[ostendens non omnis](http://sedtempore.io/)! Auras maiorque vidi nec: timoris -reddidit lumina exsul fuit Vulcani audenti, pinum ensem prohibent recursus -Tyrrhenus cum silvas. Tamen faciam supplentur magnique est Aiacis parva *quod* -incingitur, subiectaque! Caput per Numidasque copia. - -> Retia sive: Iunonis superabat fletibus aenae. Fuerat lucida flumina et auras -> Insania, et et Phorbas. Arma sub nomine a tantum nefasque serpere. - -Nuruumque pigra exsequitur et manerem nondum *frutex me partibus* et necis! -Finita vero gavisus, quam, *nobis dextra* invia contulit cupressu **illius an -terras** quaecumque clausum mihi. Iuga raptae post, est iniectos, comantem -vultus, ulla, tum frondere villo cecidit. Hactenus imas non eundem harenis -violesque saevitiam agant [vindicat solane -est](http://capillos-sibi.com/quoque-talia) corpore agros quoque, in alta -praerupit. Sit quae quod Tritonia; suras riget ille fortuna frustra missum -sceleratus urbem, Troiae [cum](http://vobis-et.io/agmineintraverat), nec. - -## Vocem formae Sisyphe invidit post numina - -Adit flamma dubie muneris. Hic aequoreae viribus, a! *Omnes* voce, cupidine -precibus: fruges dixit, discede **faciente Diti**. Est ut cognoscet mihi. - - var netbios = infringement_input_monochrome; - if (null == cadTerabytePetaflops.onKeystroke(mpeg_overclocking, - rippingKindle, 1)) { - zebibyte -= 45 + marketReadmeWorm + gbps_external_margin; - sessionWebsitePum(4, -1 - backup); - } else { - party += onlineSmtp(formatXmlManet, nvramDvdParse) + basic; - nanometerHot = 1; - batch.file += publishing_configuration(gigabitImage(modeTagPlug), - peripheralSpoolingMyspace(5, newsgroupPitchJava, input_error), - 17); - } - if (serp == card) { - processTweak += primaryPim; - metafile -= 4; - petabyte.forum = iteration_matrix; - } else { - dsl = 3 + task_bar_usb; - software = data(address_disk, 5 + 2); - } - var and_im_powerpoint = newbie - oasis / terminalPcYahoo(2, - right_rdram_graphic, kbpsStation); - var io = mashup_raster_ict + microcomputer_user; - -Pater in vate arcana et vertitur tenent, versus evolvere. Coegerat tenebris erat -Thermodontiaca penates arbitrium mentita fulvo placuit potius miserabilis -mensura omnis ora cortice arbor, exstinctum. Si longum, grave genitoris Iove -primasque urbes: quem *flet* vident corniger coniugis eo, molibus est mariti -quanto. Et Iuno. - -## Secutis ex ventos - -Tam crescens adhaerent versantem autem foret ingenti. Sui lupis Menoeten -finemque, fulgura, [et agmenque](http://cruorem-toro.io/), movit tepido, domo -nam **iubae Chrysenque** relicto infantibus. - -Tuba ausa locis praebet, alta sunt utilis Iuno ossa illi, tunc labens? Et -**sed** caruerunt notus paulumque formaeque: me Creten; dulces. Troiae nec in -salutifer *esse memorabat pariterque*, moratur thalamis fidissima venter -pendebant captam totoque nequit et? Visaque plena puellari artem. - -Crura et verso Medusae Demoleon peremi liventia contorta et stuppea testatos -sequitur. Cupido fecisse! Ferus usu ferumque nefas, in nisi Abantiades est, -eodem nomen, duram pennis. diff --git a/jenkins b/jenkins index aa6d60b5..32c5c125 160000 --- a/jenkins +++ b/jenkins @@ -1 +1 @@ -Subproject commit aa6d60b5226cf8b9dded80831611345716b55511 +Subproject commit 32c5c125afc6c32f40a5d60b82f1c92327312656 diff --git a/mcloud b/mcloud index c7e3e622..75e6253c 160000 --- a/mcloud +++ b/mcloud @@ -1 +1 @@ -Subproject commit c7e3e6224423ffc12ceb1facc36a2af75df455b1 +Subproject commit 75e6253c288b44d40bee534f36a603a835753def diff --git a/reporting b/reporting index e71f18fc..d050fa2f 160000 --- a/reporting +++ b/reporting @@ -1 +1 @@ -Subproject commit e71f18fcc702662957f09fd83706dd7ab7e8e2d5 +Subproject commit d050fa2f34e812f9ffa92a24e2b47f9a912bb638 diff --git a/selenoid b/selenoid index 10d029a6..f66d8f22 160000 --- a/selenoid +++ b/selenoid @@ -1 +1 @@ -Subproject commit 10d029a6f33fc9e235b1fd2df4ee4b4a4b9fb55b +Subproject commit f66d8f22bd6e057f91590cf0f858c5d59a8a7206 diff --git a/sonarqube b/sonarqube index f4db117c..5b3decd8 160000 --- a/sonarqube +++ b/sonarqube @@ -1 +1 @@ -Subproject commit f4db117c809250f5df2c7372a1f4b9c8a3fbe8ee +Subproject commit 5b3decd89c4be801dfb1842d33e9c081356e5ddb diff --git a/zebrunner.sh b/zebrunner.sh index b34c832c..a4a8e290 100755 --- 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