Update ui tests compose file

This commit is contained in:
Théophile Diot 2024-06-25 12:28:24 +01:00
parent 0e7d4de66b
commit 67f288edcc
No known key found for this signature in database
GPG key ID: FA995104A0BA376A
2 changed files with 60 additions and 90 deletions

View file

@ -1,10 +1,9 @@
x-env: &env
DATABASE_URI: "mariadb+pymysql://bunkerweb:secret@bw-db:3306/db"
DOCKER_HOST: "tcp://bw-docker:2375"
LOG_LEVEL: "debug"
CUSTOM_LOG_LEVEL: "debug"
services:
mybunker:
bw:
build:
context: ../..
dockerfile: src/bw/Dockerfile
@ -12,11 +11,31 @@ services:
- 80:80
- 443:443
environment:
API_WHITELIST_IP: "127.0.0.0/8 10.20.30.0/24"
labels:
- "bunkerweb.INSTANCE=yes"
networks:
bw-universe:
bw-services:
ipv4_address: 192.168.0.2
bw-scheduler:
build:
context: ../..
dockerfile: src/scheduler/Dockerfile
depends_on:
- bw
volumes:
- bw-data:/data
environment:
<<: *env
BUNKERWEB_INSTANCES: "bw"
SERVER_NAME: ""
MULTISITE: "yes"
HTTP_PORT: "80"
HTTPS_PORT: "443"
API_WHITELIST_IP: "127.0.0.0/8 10.20.30.0/24"
LOG_LEVEL: "info"
USE_BUNKERNET: "no"
USE_BLACKLIST: "no"
SEND_ANONYMOUS_REPORT: "no"
@ -34,77 +53,39 @@ services:
ngx.exit(ngx.HTTP_OK)
}
}
labels:
- "bunkerweb.INSTANCE=yes"
networks:
bw-universe:
bw-services:
ipv4_address: 192.168.0.2
bw-scheduler:
build:
context: ../..
dockerfile: src/scheduler/Dockerfile
depends_on:
- mybunker
- bw-docker
volumes:
- bw-data:/data
environment:
<<: *env
networks:
- bw-docker
- bw-universe
- bw-db
bw-ui:
build:
context: ../..
dockerfile: src/ui/Dockerfile
depends_on:
- mybunker
- bw-docker
- bw
environment:
<<: *env
networks:
- bw-docker
- bw-universe
bw-docker:
image: tecnativa/docker-socket-proxy:nightly
volumes:
- /var/run/docker.sock:/var/run/docker.sock:ro
environment:
- CONTAINERS=1
networks:
- bw-docker
- bw-db
bw-db:
image: mariadb:11
environment:
- MYSQL_RANDOM_ROOT_PASSWORD=yes
- MYSQL_DATABASE=db
- MYSQL_USER=bunkerweb
- MYSQL_PASSWORD=secret
MYSQL_RANDOM_ROOT_PASSWORD: "yes"
MYSQL_DATABASE: "db"
MYSQL_USER: "bunkerweb"
MYSQL_PASSWORD: "secret"
volumes:
- bw-db:/var/lib/mysql
networks:
- bw-docker
- bw-db
app1:
image: nginxdemos/nginx-hello
networks:
bw-services:
ipv4_address: 192.168.0.4
# ui-tests:
# build: .
# environment:
# - PYTHONUNBUFFERED=1
# extra_hosts:
# - "www.example.com:192.168.0.2"
# - "app1.example.com:192.168.0.2"
# networks:
# bw-services:
# ipv4_address: 192.168.0.3
volumes:
bw-data:
@ -123,5 +104,5 @@ networks:
driver: default
config:
- subnet: 192.168.0.0/24
bw-docker:
name: bw-docker
bw-db:
name: bw-db

View file

@ -1,7 +1,6 @@
x-env: &env
DATABASE_URI: "mariadb+pymysql://bunkerweb:secret@bw-db:3306/db"
DOCKER_HOST: "tcp://bw-docker:2375"
LOG_LEVEL: "debug"
CUSTOM_LOG_LEVEL: "debug"
services:
bw:
@ -11,6 +10,24 @@ services:
- 80:80
- 443:443
environment:
API_WHITELIST_IP: "127.0.0.0/8 10.20.30.0/24"
labels:
- "bunkerweb.INSTANCE=yes"
networks:
bw-universe:
bw-services:
ipv4_address: 192.168.0.2
bw-scheduler:
image: bunkerity/bunkerweb-scheduler:1.6.0-beta
pull_policy: never
depends_on:
- bw
volumes:
- bw-data:/data
environment:
<<: *env
BUNKERWEB_INSTANCES: "bw"
SERVER_NAME: ""
MULTISITE: "yes"
HTTP_PORT: "80"
@ -35,60 +52,32 @@ services:
ngx.exit(ngx.HTTP_OK)
}
}
labels:
- "bunkerweb.INSTANCE=yes"
networks:
bw-universe:
bw-services:
ipv4_address: 192.168.0.2
bw-scheduler:
image: bunkerity/bunkerweb-scheduler:1.6.0-beta
pull_policy: never
depends_on:
- bw
- bw-docker
volumes:
- bw-data:/data
environment:
<<: *env
networks:
- bw-docker
- bw-universe
- bw-db
bw-ui:
image: bunkerity/bunkerweb-ui:1.6.0-beta
pull_policy: never
depends_on:
- bw
- bw-docker
environment:
<<: *env
networks:
- bw-docker
- bw-universe
bw-docker:
image: tecnativa/docker-socket-proxy:nightly
volumes:
- /var/run/docker.sock:/var/run/docker.sock:ro
environment:
- CONTAINERS=1
- LOG_LEVEL=warning
networks:
- bw-docker
- bw-db
bw-db:
image: mariadb:11
environment:
- MYSQL_RANDOM_ROOT_PASSWORD=yes
- MYSQL_DATABASE=db
- MYSQL_USER=bunkerweb
- MYSQL_PASSWORD=secret
MYSQL_RANDOM_ROOT_PASSWORD: "yes"
MYSQL_DATABASE: "db"
MYSQL_USER: "bunkerweb"
MYSQL_PASSWORD: "secret"
volumes:
- bw-db:/var/lib/mysql
networks:
- bw-docker
- bw-db
app1:
image: nginxdemos/nginx-hello
@ -113,5 +102,5 @@ networks:
driver: default
config:
- subnet: 192.168.0.0/24
bw-docker:
name: bw-docker
bw-db:
name: bw-db