From 8cbd0162940d7a39da780bfe1cbae7411ada7788 Mon Sep 17 00:00:00 2001 From: kobenguyent Date: Fri, 15 Nov 2024 15:00:55 +0100 Subject: [PATCH 1/7] tryout testcontainers --- test/docker-compose.yml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/test/docker-compose.yml b/test/docker-compose.yml index 7c37d971d..7d2f1f0a5 100644 --- a/test/docker-compose.yml +++ b/test/docker-compose.yml @@ -68,10 +68,13 @@ services: json_server: <<: *test-service - entrypoint: [] - command: npm run json-server - expose: - - 8010 + image: testcontainers/json-server:latest + environment: + - JSON_SERVER_PORT=8010 + ports: + - 8010:8010 + volumes: + - ./data/rest/db.json:/data puppeteer-image: image: ghcr.io/puppeteer/puppeteer:22.4.1 From dc1982d8f0d74d74e014a640efb4c0fb3e8ad914 Mon Sep 17 00:00:00 2001 From: kobenguyent Date: Fri, 15 Nov 2024 15:23:39 +0100 Subject: [PATCH 2/7] tryout testcontainers --- test/docker-compose.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/test/docker-compose.yml b/test/docker-compose.yml index 7d2f1f0a5..b4684c239 100644 --- a/test/docker-compose.yml +++ b/test/docker-compose.yml @@ -67,7 +67,6 @@ services: - .:/test json_server: - <<: *test-service image: testcontainers/json-server:latest environment: - JSON_SERVER_PORT=8010 From dba0e11fb92319c1c19d7502b56050987a4139bd Mon Sep 17 00:00:00 2001 From: kobenguyent Date: Fri, 15 Nov 2024 15:29:50 +0100 Subject: [PATCH 3/7] tryout testcontainers --- test/docker-compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/test/docker-compose.yml b/test/docker-compose.yml index b4684c239..f33bea1f2 100644 --- a/test/docker-compose.yml +++ b/test/docker-compose.yml @@ -67,6 +67,7 @@ services: - .:/test json_server: + <<: &test-service image: testcontainers/json-server:latest environment: - JSON_SERVER_PORT=8010 From c6fc245e6e393e11a6d7b940d213f36fde0c2aed Mon Sep 17 00:00:00 2001 From: kobenguyent Date: Fri, 15 Nov 2024 15:30:14 +0100 Subject: [PATCH 4/7] tryout testcontainers --- test/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/docker-compose.yml b/test/docker-compose.yml index f33bea1f2..7d2f1f0a5 100644 --- a/test/docker-compose.yml +++ b/test/docker-compose.yml @@ -67,7 +67,7 @@ services: - .:/test json_server: - <<: &test-service + <<: *test-service image: testcontainers/json-server:latest environment: - JSON_SERVER_PORT=8010 From afccb42f18c8142b0148ef1038490d7a31391757 Mon Sep 17 00:00:00 2001 From: kobenguyent Date: Fri, 15 Nov 2024 15:31:25 +0100 Subject: [PATCH 5/7] tryout testcontainers --- test/support/TestHelper.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/support/TestHelper.js b/test/support/TestHelper.js index 7e605fb20..71e64bc96 100644 --- a/test/support/TestHelper.js +++ b/test/support/TestHelper.js @@ -20,7 +20,7 @@ class TestHelper { } static jsonServerUrl() { - return process.env.JSON_SERVER_URL || 'http://localhost:8010' + return 'http://localhost:8010' } static graphQLServerPort() { From df11079663e3e4ecb922f6c6363b3171aaa2ad4d Mon Sep 17 00:00:00 2001 From: kobenguyent Date: Fri, 15 Nov 2024 15:48:00 +0100 Subject: [PATCH 6/7] tryout testcontainers --- test/docker-compose.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/docker-compose.yml b/test/docker-compose.yml index 7d2f1f0a5..5a97107a5 100644 --- a/test/docker-compose.yml +++ b/test/docker-compose.yml @@ -68,9 +68,9 @@ services: json_server: <<: *test-service - image: testcontainers/json-server:latest - environment: - - JSON_SERVER_PORT=8010 + image: vimagick/json-server + command: -H 0.0.0.0 -p 8010 -w db.json + restart: always ports: - 8010:8010 volumes: From 4f679f4d9c478daee29d4a0f429084e975c6ab1d Mon Sep 17 00:00:00 2001 From: kobenguyent Date: Fri, 15 Nov 2024 15:57:09 +0100 Subject: [PATCH 7/7] tryout testcontainers --- test/support/TestHelper.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/support/TestHelper.js b/test/support/TestHelper.js index 71e64bc96..7e605fb20 100644 --- a/test/support/TestHelper.js +++ b/test/support/TestHelper.js @@ -20,7 +20,7 @@ class TestHelper { } static jsonServerUrl() { - return 'http://localhost:8010' + return process.env.JSON_SERVER_URL || 'http://localhost:8010' } static graphQLServerPort() {