From ad181dd9fc3caf0f94c13409987a8cda9c7ea692 Mon Sep 17 00:00:00 2001 From: vdelendik Date: Tue, 16 Apr 2024 17:24:41 +0300 Subject: [PATCH 1/7] bump up to stf:2.7.0-beta1 --- .env.original | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env.original b/.env.original index adf0a9d..827447c 100644 --- a/.env.original +++ b/.env.original @@ -7,7 +7,7 @@ TAG_NGINX=1.25.3 # MCloud TAG_SELENIUM_HUB=2.5 TAG_RETHINKDB=2.4.2 -TAG_STF=2.6.5 +TAG_STF=2.7.0-beta1 # Authentication AUTH_SYSTEM=auth-mock From 7c250a15c3acad97369fea4c72c625564462e9e9 Mon Sep 17 00:00:00 2001 From: vdelendik Date: Fri, 26 Apr 2024 16:45:10 +0300 Subject: [PATCH 2/7] bump up to stf:2.7.0-beta3 --- .env.original | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env.original b/.env.original index 827447c..e81e7f2 100644 --- a/.env.original +++ b/.env.original @@ -7,7 +7,7 @@ TAG_NGINX=1.25.3 # MCloud TAG_SELENIUM_HUB=2.5 TAG_RETHINKDB=2.4.2 -TAG_STF=2.7.0-beta1 +TAG_STF=2.7.0-beta3 # Authentication AUTH_SYSTEM=auth-mock From e55b2c2194f60b40637d64a55244e3e0bfe42b98 Mon Sep 17 00:00:00 2001 From: vdelendik Date: Tue, 7 May 2024 16:56:04 +0300 Subject: [PATCH 3/7] #214: migrated to docker compose as a plugin --- docker-compose.yml | 5 ++--- zebrunner.sh | 8 ++++---- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 1b40ba1..a941300 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: stf-proxy: image: "nginx:${TAG_NGINX}" diff --git a/zebrunner.sh b/zebrunner.sh index a3d5f10..78fe641 100755 --- a/zebrunner.sh +++ b/zebrunner.sh @@ -101,7 +101,7 @@ fi fi - docker-compose --env-file .env -f docker-compose.yml down -v + docker compose down -v rm -f backup/settings.env rm -f .env @@ -133,7 +133,7 @@ exit -1 fi - docker-compose --env-file .env -f docker-compose.yml up -d + docker compose up -d } stop() { @@ -141,7 +141,7 @@ exit 0 fi - docker-compose --env-file .env -f docker-compose.yml stop + docker compose stop } down() { @@ -149,7 +149,7 @@ exit 0 fi - docker-compose --env-file .env -f docker-compose.yml down + docker compose down } backup() { From 297176698f17492e639cc7ce2490cf9e1878f9de Mon Sep 17 00:00:00 2001 From: vdelendik Date: Mon, 20 May 2024 13:51:34 +0300 Subject: [PATCH 4/7] #229: updated readme for docker and compose plugin --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index a2be9f1..0124aa0 100644 --- a/README.md +++ b/README.md @@ -24,9 +24,9 @@ Feel free to support the development with a [**donation**](https://www.paypal.co ### 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+ From 5f36a72fca9f4b614a07fd9346d349e411fc57da Mon Sep 17 00:00:00 2001 From: vdelendik Date: Mon, 20 May 2024 13:53:00 +0300 Subject: [PATCH 5/7] updated prerequisites to have reqiored components installed --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 0124aa0..38bcda8 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ Feel free to support the development with a [**donation**](https://www.paypal.co * Installed Docker compose plugin v2.20.3+ -* Install git 2.20.0+ +* Installed git 2.20.0+ ## Usage 1. Clone [mcloud](https://github.com/zebrunner/mcloud) and set up: From 47b5564488e7cc64202411dbca21ee88f3c054f5 Mon Sep 17 00:00:00 2001 From: vdelendik Date: Mon, 20 May 2024 14:02:16 +0300 Subject: [PATCH 6/7] misprint fix --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 38bcda8..aa6fa3d 100644 --- a/README.md +++ b/README.md @@ -43,7 +43,7 @@ Feel free to support the development with a [**donation**](https://www.paypal.co 6. Paste generated token into the variables.env for `STF_TOKEN` var 7. Restart services using `./zebrunner.sh restart` 8. Set up the servers with Android and iOS devices according to [mcloud-agent](https://github.com/zebrunner/mcloud-agent) - > [mcloud-ios](https://github.com/zebrunner/mcloud-ios) is deprecated. Use the same can be [mcloud-agent](https://github.com/zebrunner/mcloud-agent) to setup on MacOS too! + > [mcloud-ios](https://github.com/zebrunner/mcloud-ios) is deprecated. Use the same [mcloud-agent](https://github.com/zebrunner/mcloud-agent) to setup on MacOS too! 9. Use `http://hostname:80/mcloud/grid/console` to see connected devices and `http://hostname:80/mcloud/wd/hub` as Selenium/Appium hub url for test automation. > Follow the installation and configuration guide in [Zebrunner CE](https://zebrunner.github.io/community-edition) to reuse MCloud components effectively for Test Automation. From 2d64365fdcd688955f9ebc16624b9c57e478c9de Mon Sep 17 00:00:00 2001 From: vdelendik Date: Mon, 20 May 2024 14:49:39 +0300 Subject: [PATCH 7/7] #230: bump up to rc stf:2.7 image --- .env.original | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env.original b/.env.original index e81e7f2..7e2b62f 100644 --- a/.env.original +++ b/.env.original @@ -7,7 +7,7 @@ TAG_NGINX=1.25.3 # MCloud TAG_SELENIUM_HUB=2.5 TAG_RETHINKDB=2.4.2 -TAG_STF=2.7.0-beta3 +TAG_STF=2.7 # Authentication AUTH_SYSTEM=auth-mock