Update zahori-server version to 0.1.17

zahori-io · Jun 19, 2023 · 45d3237 · 45d3237
1 parent d00e911
commit 45d3237
Show file tree

Hide file tree

Showing 5 changed files with 71 additions and 33 deletions.
diff --git a/browsers b/browsers
@@ -1,5 +1,5 @@
-selenoid/vnc_chrome:110.0
-browsers/edge:110.0
-selenoid/vnc_firefox:110.0
-selenoid/vnc_opera:94.0
+selenoid/vnc_chrome:114.0
+browsers/edge:114.0
+selenoid/vnc_firefox:114.0
+selenoid/vnc_opera:98.0
 browsers/safari:15.0
diff --git a/database/sql_versions/V0.1.17.sql b/database/sql_versions/V0.1.17.sql
@@ -0,0 +1,19 @@
+---------------- PERIODIC EXECUTIONS ----------------
+ALTER TABLE public.periodic_executions ALTER COLUMN "time" TYPE varchar USING "time"::varchar;
+ALTER TABLE public.periodic_executions ALTER COLUMN days TYPE text[] USING days::text[];
+ALTER TABLE public.periodic_executions ADD uuid uuid NOT NULL;
+ALTER TABLE public.periodic_executions ADD execution_id int4 NULL;
+ALTER TABLE public.periodic_executions ADD CONSTRAINT rel_periodic_executions_executions_fk FOREIGN KEY (execution_id) REFERENCES public.executions(execution_id);
+
+---------------- EXECUTIONS ----------------
+ALTER TABLE public.executions ADD "trigger" varchar NULL;
+UPDATE public.executions SET trigger = 'Manual';
+ALTER TABLE public.executions DROP CONSTRAINT rel_periodic_executions_executions_fk;
+ALTER TABLE public.executions DROP COLUMN periodic_execution_id;
+
+---------------- UPDATE BROWSER VERSIONS ----------------
+UPDATE public.browsers SET default_version = '114.0' WHERE browser_name = 'chrome';
+UPDATE public.browsers SET default_version = '114.0' WHERE browser_name = 'edge';
+UPDATE public.browsers SET default_version = '114.0' WHERE browser_name = 'firefox';
+UPDATE public.browsers SET default_version = '98.0' WHERE browser_name = 'opera';
+UPDATE public.browsers SET default_version = '15.0' WHERE browser_name = 'safari';
diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -2,13 +2,13 @@ version: '3'
 services:
 
   consul:
-    image: consul:1.14.4
+    image: consul:1.15.3
     ports:
       - "${ZAHORI_CONSUL_PORT}:8500"
     network_mode: bridge
 
   database:
-    image: postgres:12.14-alpine
+    image: postgres:12.15-alpine
     restart: always
     ports:
       - "${ZAHORI_DB_PORT}:5432"
@@ -33,7 +33,7 @@ services:
       - database
 
   zahori-server:
-    image: zahoriaut/zahori-server:0.1.16
+    image: zahoriaut/zahori-server:0.1.17
     ports:
       - "${ZAHORI_SERVER_PORT}:${ZAHORI_SERVER_PORT}"
     network_mode: bridge
@@ -58,13 +58,14 @@ services:
     volumes:
      - ./evidences:/usr/app/evidences
      - ./logs:/usr/app/logs
+#     - ./timezone:/etc/timezone:ro
     depends_on:
      - flyway
      - consul
      - selenoid-ui
 
   selenoid:
-    image: "aerokube/selenoid:1.10.10"
+    image: "aerokube/selenoid:1.10.12"
     network_mode: bridge
     ports:
       - "${ZAHORI_SELENOID_PORT}:4444"
@@ -78,7 +79,7 @@ services:
     command: ["-conf", "/etc/selenoid/browsers.json", "-video-output-dir", "/opt/selenoid/video", "-log-output-dir", "/opt/selenoid/logs", "-limit", "5"]
 
   selenoid-ui:
-    image: "aerokube/selenoid-ui:1.10.9"
+    image: "aerokube/selenoid-ui:1.10.10"
     ports:
       - "${ZAHORI_SELENOID_UI_INTERNAL_PORT}:8080"
     command: ["--selenoid-uri", "http://selenoid:${ZAHORI_SELENOID_PORT}", "--allowed-origin", "*"]
@@ -88,6 +89,21 @@ services:
     links:
       - selenoid
 
+  zahori-scheduler:
+    image: zahoriaut/zahori-scheduler:1.0.0
+    network_mode: bridge
+    links:
+      - zahori-server
+      - consul
+    environment:
+     - ZAHORI_CONSUL_HOST=${ZAHORI_CONSUL_HOST}
+     - ZAHORI_CONSUL_PORT=${ZAHORI_CONSUL_PORT}
+    depends_on:
+     - zahori-server
+     - consul
+#    volumes:
+#     - ./timezone:/etc/timezone:ro
+
 #  zahori-process:
 #    image: zahoriaut/zahori-process:0.1.11
 #    network_mode: bridge
@@ -103,6 +119,8 @@ services:
 #    depends_on:
 #     - zahori-server
 #     - consul
+#    volumes:
+#     - ./timezone:/etc/timezone:ro
 
 volumes:
   zahori-database:

diff --git a/selenoid/config/browsers.json b/selenoid/config/browsers.json
@@ -1,29 +1,27 @@
  {
-  "safari": {
+  "chrome": {
     "default": "latest",
     "versions": {
       "latest": {
-        "image": "browsers/safari:15.0",
-        "port": "4444",
-        "path": "/"
+        "image": "selenoid/vnc_chrome:114.0",
+        "port": "4444"
       },
-      "15.0": {
-        "image": "browsers/safari:15.0",
-        "port": "4444",
-        "path": "/"
+      "114.0": {
+        "image": "selenoid/vnc_chrome:114.0",
+        "port": "4444"
       }
     }
   },
   "MicrosoftEdge": {
     "default": "latest",
     "versions": {
       "latest": {
-        "image": "browsers/edge:110.0",
+        "image": "browsers/edge:114.0",
         "port": "4444",
         "path": "/"
       },
-      "110.0": {
-        "image": "browsers/edge:110.0",
+      "114.0": {
+        "image": "browsers/edge:114.0",
         "port": "4444",
         "path": "/"
       }          
@@ -33,40 +31,42 @@
     "default": "latest",
     "versions": {
       "latest": {
-        "image": "selenoid/vnc_firefox:110.0",
+        "image": "selenoid/vnc_firefox:114.0",
         "port": "4444",
         "path": "/wd/hub"
       },
-      "110.0": {
-        "image": "selenoid/vnc_firefox:110.0",
+      "114.0": {
+        "image": "selenoid/vnc_firefox:114.0",
         "port": "4444",
         "path": "/wd/hub"
       }
     }
   },
-  "chrome": {
+  "opera": {
     "default": "latest",
     "versions": {
       "latest": {
-        "image": "selenoid/vnc_chrome:110.0",
+        "image": "selenoid/vnc_opera:98.0",
         "port": "4444"
       },
-      "110.0": {
-        "image": "selenoid/vnc_chrome:110.0",
+      "98.0": {
+        "image": "selenoid/vnc_opera:98.0",
         "port": "4444"
       }
     }
   },
-  "opera": {
+  "safari": {
     "default": "latest",
     "versions": {
       "latest": {
-        "image": "selenoid/vnc_opera:94.0",
-        "port": "4444"
+        "image": "browsers/safari:15.0",
+        "port": "4444",
+        "path": "/"
       },
-      "94.0": {
-        "image": "selenoid/vnc_opera:94.0",
-        "port": "4444"
+      "15.0": {
+        "image": "browsers/safari:15.0",
+        "port": "4444",
+        "path": "/"
       }
     }
   }

diff --git a/timezone b/timezone
@@ -0,0 +1 @@
+Europe/Madrid