From 49e32a4293630bec509ef9d320a46a5280c8259f Mon Sep 17 00:00:00 2001 From: Yalz Date: Fri, 26 Jul 2024 16:53:45 +0200 Subject: [PATCH] chore: use LDES server 3.x --- load-testing/docker-compose.yml | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/load-testing/docker-compose.yml b/load-testing/docker-compose.yml index 580e0f3..fc9c1d6 100644 --- a/load-testing/docker-compose.yml +++ b/load-testing/docker-compose.yml @@ -117,15 +117,17 @@ services: cpus: '0.10' memory: '0.25GB' - ldes-mongodb: - container_name: performance_testing_ldes-mongodb - image: mongo:${MONGODB_TAG:-latest} + ldes-postgres: + container_name: ldes-postgres + image: postgres:14-alpine + ports: + - 5432:5432 + environment: + - POSTGRES_PASSWORD=admin + - POSTGRES_USER=admin + - POSTGRES_DB=test networks: - performance_testing - ports: - - ${MONGODB_PORT:-27017}:27017 - # volumes: - # - ./database:/data/db:rw deploy: resources: limits: @@ -141,9 +143,9 @@ services: # image: ldes/ldes-server:${LDES_SERVER_TAG:-2.3.0-SNAPSHOT} # CrowdScan # image: ldes/ldes-server:${LDES_SERVER_TAG:-2.4.1-SNAPSHOT} # Geomobility # image: ldes/ldes-server:${LDES_SERVER_TAG:-2.10.0-SNAPSHOT} # Telraam - image: ldes/ldes-server:${LDES_SERVER_TAG:-2.14.0-SNAPSHOT} +# image: ldes/ldes-server:${LDES_SERVER_TAG:-2.14.0-SNAPSHOT} # image: ghcr.io/informatievlaanderen/ldes-server:20240405144556 - # image: ghcr.io/informatievlaanderen/ldes-server:20240405143052 + image: ghcr.io/informatievlaanderen/ldes-server:20240726130951 networks: - performance_testing ports: @@ -152,13 +154,16 @@ services: - ./server/tmp/epsg:/tmp/Databases:rw - ./server/config.yml:/application.yml:ro depends_on: - - ldes-mongodb + - ldes-postgres healthcheck: test: ["CMD", "wget", "-qO-", "http://ldes-server:8080/actuator/health"] environment: - SIS_DATA=/tmp - JAVA_TOOL_OPTIONS=-XX:MaxRAMPercentage=90 -XX:MinRAMPercentage=50 - SPRING_DATA_MONGODB_URI=mongodb://ldes-mongodb:27017/performance-testing + - spring_Datasource_URL=jdbc:postgresql://ldes-postgres:5432/test + - SPRING_DATASOURCE_USERNAME=admin + - SPRING_DATASOURCE_PASSWORD=admin - LDESSERVER_HOSTNAME=http://ldes-server:${LDES_SERVER_PORT:-8080} - SERVER_PORT=8080 deploy: