diff --git a/docker-compose.yml b/docker-compose.yml index 01f7e19..53f1303 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -52,14 +52,6 @@ services: #### # Speckle Server ####### - speckle-frontend: - image: speckle/speckle-frontend:latest - restart: always - ports: - - "0.0.0.0:8080:8080" - environment: - FILE_SIZE_LIMIT_MB: 100 - speckle-server: image: speckle/speckle-server:latest restart: always @@ -111,46 +103,27 @@ services: POSTGRES_DB: "speckle" ENABLE_MP: "false" - preview-service: - image: speckle/speckle-preview-service:latest - restart: always - depends_on: - speckle-server: - condition: service_healthy - mem_limit: "1000m" - memswap_limit: "1000m" - environment: - DEBUG: "preview-service:*" - PG_CONNECTION_STRING: "postgres://speckle:speckle@postgres/speckle" + #### + # Testing and development tools + ####### - webhook-service: - image: speckle/speckle-webhook-service:latest - restart: always - depends_on: - speckle-server: - condition: service_healthy - environment: - DEBUG: "webhook-service:*" - PG_CONNECTION_STRING: "postgres://speckle:speckle@postgres/speckle" - WAIT_HOSTS: postgres:5432 - - fileimport-service: - image: speckle/speckle-fileimport-service:latest - restart: always - depends_on: - speckle-server: - condition: service_healthy - environment: - DEBUG: "fileimport-service:*" - PG_CONNECTION_STRING: "postgres://speckle:speckle@postgres/speckle" - WAIT_HOSTS: postgres:5432 - - S3_ENDPOINT: "http://minio:9000" - S3_ACCESS_KEY: "minioadmin" - S3_SECRET_KEY: "minioadmin" - S3_BUCKET: "speckle-server" - - SPECKLE_SERVER_URL: "http://speckle-server:3000" + toxiproxy: + ### + # Toxiproxy is a tool to simulate network conditions https://github.com/Shopify/toxiproxy + # Instead of connecting to speckle-server on port 3000, connect to ToxiProxy on port 3001 + # Toxiproxy will forward the connection to speckle-server + # Use the ToxiProxy API to simulate network conditions as necessary + ### + image: ghcr.io/shopify/toxiproxy:2.9.0 + volumes: + # This mounts the toxiproxy.json file into the container at /config/toxiproxy.json + - ./toxiproxy.json:/config/toxiproxy.json + # This command starts toxiproxy with the configuration file + entrypoint: /toxiproxy -config /config/toxiproxy.json + ports: + # open ports to match the 'listen' ports in the toxiproxy.json file + - 8474:8474 # Toxiproxy API + - 3001:3001 # Speckle server networks: default: diff --git a/tests/integration/conftest.py b/tests/integration/conftest.py index cd576b4..122a336 100644 --- a/tests/integration/conftest.py +++ b/tests/integration/conftest.py @@ -17,7 +17,7 @@ metrics.disable() @pytest.fixture(scope="session") def host(): - return "localhost:3000" + return "localhost:3001" def seed_user(host):