From 58fdc8441f163a15e953dbe054a192bac8639ec2 Mon Sep 17 00:00:00 2001 From: kev Date: Thu, 16 Sep 2021 15:46:38 +0800 Subject: [PATCH] update --- selenium/docker-compose.yml | 47 ++++++++++++++++++++------- selenium/grid/docker-compose-hub.yml | 2 -- selenium/grid/docker-compose-node.yml | 29 +++++++++-------- snort3/Dockerfile | 4 +-- 4 files changed, 54 insertions(+), 28 deletions(-) diff --git a/selenium/docker-compose.yml b/selenium/docker-compose.yml index 0591792..e1e023e 100644 --- a/selenium/docker-compose.yml +++ b/selenium/docker-compose.yml @@ -1,11 +1,36 @@ -firefox: - image: selenium/standalone-firefox-debug - ports: - - "4444:4444" - - "5900:5900" - environment: - - JAVA_OPTS=-Xmx512m - - SCREEN_WIDTH=1024 - - SCREEN_HEIGHT=768 - - SCREEN_DEPTH=16 - restart: always +version: "3.8" + +services: + + hub: + image: selenium/hub:4 + ports: + - "4442:4442" + - "4443:4443" + - "4444:4444" + restart: unless-stopped + + chrome: + image: selenium/node-chrome:4 + ports: + - "5900:5900" + environment: + - SE_EVENT_BUS_HOST=hub + - SE_EVENT_BUS_PUBLISH_PORT=4442 + - SE_EVENT_BUS_SUBSCRIBE_PORT=4443 + - SE_NODE_MAX_SESSIONS=4 + shm_size: 2gb + depends_on: + - hub + restart: unless-stopped + + video: + image: selenium/video + volumes: + - ./data:/videos + depends_on: + - chrome + environment: + - DISPLAY_CONTAINER_NAME=chrome + - FILE_NAME=output.mp4 + restart: unless-stopped diff --git a/selenium/grid/docker-compose-hub.yml b/selenium/grid/docker-compose-hub.yml index 15f486d..e33ffdb 100644 --- a/selenium/grid/docker-compose-hub.yml +++ b/selenium/grid/docker-compose-hub.yml @@ -6,8 +6,6 @@ services: image: selenium/hub:3.141.59 ports: - "4444:4444" - volumes: - - /dev/shm:/dev/shm environment: - JAVA_OPTS=-Xmx512m - GRID_TIMEOUT=60 diff --git a/selenium/grid/docker-compose-node.yml b/selenium/grid/docker-compose-node.yml index 48f4669..5528962 100644 --- a/selenium/grid/docker-compose-node.yml +++ b/selenium/grid/docker-compose-node.yml @@ -1,13 +1,16 @@ -chrome: - image: selenium/node-chrome:3.141.59 - ports: - - "5555:5555" - volumes: - - /dev/shm:/dev/shm - environment: - - HUB_HOST=10.0.0.21 - - HUB_PORT=4444 - - REMOTE_HOST=http://10.0.0.22:5555 - - NODE_MAX_INSTANCES=2 - - NODE_MAX_SESSION=2 - restart: unless-stopped +version: '3.8' + +services: + + chrome: + image: selenium/node-chrome:3.141.59 + ports: + - "5555:5555" + environment: + - HUB_HOST=10.0.0.21 + - HUB_PORT=4444 + - REMOTE_HOST=http://10.0.0.22:5555 + - NODE_MAX_INSTANCES=2 + - NODE_MAX_SESSION=2 + shm_size: 2gb + restart: unless-stopped diff --git a/snort3/Dockerfile b/snort3/Dockerfile index 601ad8c..fae0541 100644 --- a/snort3/Dockerfile +++ b/snort3/Dockerfile @@ -5,8 +5,8 @@ FROM ubuntu:20.04 MAINTAINER EasyPi Software Foundation -ENV SNORT_VERSION=3.1.9.0 -ENV LIBDAQ_VERSION=3.0.4 +ENV SNORT_VERSION=3.1.12.0 +ENV LIBDAQ_VERSION=3.0.5 ENV LIBDNET_VERSION=1.14 ARG DEBIAN_FRONTEND=noninteractive