From 95926cc8de2c6301d854884ee221d3c7d269af43 Mon Sep 17 00:00:00 2001 From: Dmitry Afanasyev Date: Sun, 28 Aug 2022 21:11:00 +0300 Subject: [PATCH] add test docker-compose file --- .github/workflows/test-selenoid.yml | 2 +- docker-compose.test.yml | 53 +++++++++++++++++++++++++++++ docker-compose.yml | 4 +-- 3 files changed, 55 insertions(+), 4 deletions(-) create mode 100644 docker-compose.test.yml diff --git a/.github/workflows/test-selenoid.yml b/.github/workflows/test-selenoid.yml index 4319c38..ee3441a 100644 --- a/.github/workflows/test-selenoid.yml +++ b/.github/workflows/test-selenoid.yml @@ -15,4 +15,4 @@ jobs: - name: Checkout code uses: actions/checkout@v3 - name: Run tests - run: LOCALTEST=1 docker-compose run bot python -m pytest tests/bot/test_bot.py::test_selenoid_text -vv \ No newline at end of file + run: LOCALTEST=1 docker-compose -f docker-compose.test.yml run bot python -m pytest tests/bot/test_bot.py::test_selenoid_text -vv \ No newline at end of file diff --git a/docker-compose.test.yml b/docker-compose.test.yml new file mode 100644 index 0000000..212dda1 --- /dev/null +++ b/docker-compose.test.yml @@ -0,0 +1,53 @@ +version: '3.9' + +networks: + transport_bot_network: + name: + "transport_bot_network" + ipam: + config: + - subnet: 200.20.0.0/24 + +services: + selenoid: + container_name: "transport_bot_selenoid" + hostname: "selenoid_host" + build: + context: . + dockerfile: ./deploy/Dockerfile.selenoid + restart: unless-stopped + environment: + - SESSION_TIMED_OUT=30s + networks: + transport_bot_network: + ipv4_address: 200.20.0.10 + volumes: + - ./deploy/browsers.json:/etc/selenoid/browsers.json:ro + - /var/run/docker.sock:/var/run/docker.sock + command: ["-conf", "/etc/selenoid/browsers.json", "-limit", "10", + "-container-network", "transport_bot_network", "-timeout", "30s"] + expose: + - "4444" + + bot: + container_name: "transport_bot" + hostname: "transport_bot" + image: "transport_bot:latest" + build: + context: . + dockerfile: ./deploy/Dockerfile.bot + args: + USER: root + restart: unless-stopped + environment: + LOCALTEST: ${LOCALTEST} + depends_on: + - selenoid + volumes: + - /etc/localtime:/etc/localtime:ro + networks: + transport_bot_network: + ipv4_address: 200.20.0.11 + expose: + - "8084" + command: bash start-bot.sh diff --git a/docker-compose.yml b/docker-compose.yml index ddd35b2..480966e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -43,10 +43,8 @@ services: context: . dockerfile: ./deploy/Dockerfile.bot args: - USER: root + USER: web restart: unless-stopped - environment: - LOCALTEST: ${LOCALTEST} depends_on: - selenoid volumes: