From 4bd29129a5595b27370a8c89aa9440e527dcb1bd Mon Sep 17 00:00:00 2001 From: Thomas Hanke <38633260+ThHanke@users.noreply.github.com> Date: Fri, 17 May 2024 13:07:25 +0200 Subject: [PATCH 01/10] Update TestExamples.yml --- .github/workflows/TestExamples.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/TestExamples.yml b/.github/workflows/TestExamples.yml index be8c206..7ab78ec 100644 --- a/.github/workflows/TestExamples.yml +++ b/.github/workflows/TestExamples.yml @@ -24,7 +24,7 @@ jobs: fetch-depth: 0 - name: run app run: | - docker-compose up -d + docker-compose -f docker-compose.develop.yml up -d sleep 20 docker ps -a - name: parse mapping to YARRRML parser From 8faa5efcb86c9559a8f3df85270dbd48156267bf Mon Sep 17 00:00:00 2001 From: Thomas Hanke <38633260+ThHanke@users.noreply.github.com> Date: Fri, 17 May 2024 13:10:45 +0200 Subject: [PATCH 02/10] Update TestExamples.yml --- .github/workflows/TestExamples.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/TestExamples.yml b/.github/workflows/TestExamples.yml index 7ab78ec..e19ac00 100644 --- a/.github/workflows/TestExamples.yml +++ b/.github/workflows/TestExamples.yml @@ -14,6 +14,7 @@ env: APP_PORT: 5003 MAPPER_PORT: 4000 CONVERTER_PORT: 6000 + SSL_VERIFY: False jobs: TestExamples: From dc00d1cecb316980bc964f635c1372362de70a58 Mon Sep 17 00:00:00 2001 From: Thomas Hanke <38633260+ThHanke@users.noreply.github.com> Date: Fri, 17 May 2024 13:14:51 +0200 Subject: [PATCH 03/10] Update TestExamples.yml --- .github/workflows/TestExamples.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/TestExamples.yml b/.github/workflows/TestExamples.yml index e19ac00..3d11ad0 100644 --- a/.github/workflows/TestExamples.yml +++ b/.github/workflows/TestExamples.yml @@ -32,6 +32,11 @@ jobs: working-directory: ${{env.WORKING_DIR}} run: | curl -X POST "http://localhost:${{env.APP_PORT}}/api/yarrrmltorml" -H "accept: text/turtle" -H "accept: application/json" -H "Content-Type: application/json" -d "{\"mapping_url\":\"${{env.MAPPING_URL}}\"}" > example.rml + - name: container log + working-directory: ${{env.WORKING_DIR}} + continue-on-error: true + run: | + docker-compose logs - name: join the method and the data meta graph working-directory: ${{env.WORKING_DIR}} run: | From 248e84964f7747b19d20013bc27be140286810e2 Mon Sep 17 00:00:00 2001 From: Thomas Hanke <38633260+ThHanke@users.noreply.github.com> Date: Fri, 17 May 2024 13:23:45 +0200 Subject: [PATCH 04/10] Update TestExamples.yml --- .github/workflows/TestExamples.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/TestExamples.yml b/.github/workflows/TestExamples.yml index 3d11ad0..7231cd8 100644 --- a/.github/workflows/TestExamples.yml +++ b/.github/workflows/TestExamples.yml @@ -30,11 +30,11 @@ jobs: docker ps -a - name: parse mapping to YARRRML parser working-directory: ${{env.WORKING_DIR}} + continue-on-error: true run: | curl -X POST "http://localhost:${{env.APP_PORT}}/api/yarrrmltorml" -H "accept: text/turtle" -H "accept: application/json" -H "Content-Type: application/json" -d "{\"mapping_url\":\"${{env.MAPPING_URL}}\"}" > example.rml - - name: container log - working-directory: ${{env.WORKING_DIR}} - continue-on-error: true + - name: print logs on failure + if: failure() run: | docker-compose logs - name: join the method and the data meta graph From bf29ce8648beb60cafc648e2cf17ac68b66e0b34 Mon Sep 17 00:00:00 2001 From: Thomas Hanke <38633260+ThHanke@users.noreply.github.com> Date: Fri, 17 May 2024 13:27:38 +0200 Subject: [PATCH 05/10] Update TestExamples.yml --- .github/workflows/TestExamples.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/TestExamples.yml b/.github/workflows/TestExamples.yml index 7231cd8..3c8fd4d 100644 --- a/.github/workflows/TestExamples.yml +++ b/.github/workflows/TestExamples.yml @@ -33,10 +33,10 @@ jobs: continue-on-error: true run: | curl -X POST "http://localhost:${{env.APP_PORT}}/api/yarrrmltorml" -H "accept: text/turtle" -H "accept: application/json" -H "Content-Type: application/json" -d "{\"mapping_url\":\"${{env.MAPPING_URL}}\"}" > example.rml - - name: print logs on failure - if: failure() - run: | - docker-compose logs + - name: print logs on failure + if: failure() + run: | + docker-compose logs - name: join the method and the data meta graph working-directory: ${{env.WORKING_DIR}} run: | From 73ca6509e13fa82286a03f6ce30d54e4991f6119 Mon Sep 17 00:00:00 2001 From: Thomas Hanke <38633260+ThHanke@users.noreply.github.com> Date: Fri, 17 May 2024 13:30:54 +0200 Subject: [PATCH 06/10] Update TestExamples.yml --- .github/workflows/TestExamples.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/TestExamples.yml b/.github/workflows/TestExamples.yml index 3c8fd4d..64f2063 100644 --- a/.github/workflows/TestExamples.yml +++ b/.github/workflows/TestExamples.yml @@ -33,10 +33,10 @@ jobs: continue-on-error: true run: | curl -X POST "http://localhost:${{env.APP_PORT}}/api/yarrrmltorml" -H "accept: text/turtle" -H "accept: application/json" -H "Content-Type: application/json" -d "{\"mapping_url\":\"${{env.MAPPING_URL}}\"}" > example.rml - - name: print logs on failure - if: failure() - run: | - docker-compose logs + - name: print logs + if: always() + run: | + docker-compose logs - name: join the method and the data meta graph working-directory: ${{env.WORKING_DIR}} run: | From a0596427e143039dfbda516a02ca828fc6a75ed7 Mon Sep 17 00:00:00 2001 From: Thomas Hanke <38633260+ThHanke@users.noreply.github.com> Date: Fri, 17 May 2024 13:36:23 +0200 Subject: [PATCH 07/10] Update docker-compose.develop.yml --- docker-compose.develop.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.develop.yml b/docker-compose.develop.yml index 94b783e..3f54367 100644 --- a/docker-compose.develop.yml +++ b/docker-compose.develop.yml @@ -24,8 +24,8 @@ services: rdfconverter: container_name: rdfconverter build: . - ports: - - ${APP_PORT}:${CONVERTER_PORT} + expose: + - ${CONVERTER_PORT} restart: always networks: - rdfconverter_net From 8df2f6360cb2436d09dd8db08897c819f197caf9 Mon Sep 17 00:00:00 2001 From: Thomas Hanke <38633260+ThHanke@users.noreply.github.com> Date: Fri, 17 May 2024 13:38:24 +0200 Subject: [PATCH 08/10] Update TestExamples.yml --- .github/workflows/TestExamples.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/TestExamples.yml b/.github/workflows/TestExamples.yml index 64f2063..d164b33 100644 --- a/.github/workflows/TestExamples.yml +++ b/.github/workflows/TestExamples.yml @@ -13,7 +13,7 @@ env: PARSER_PORT: 3001 APP_PORT: 5003 MAPPER_PORT: 4000 - CONVERTER_PORT: 6000 + CONVERTER_PORT: 5000 SSL_VERIFY: False jobs: From a25cd6f49d0b597d7a13a39960f6bbd3b0cd3743 Mon Sep 17 00:00:00 2001 From: Thomas Hanke <38633260+ThHanke@users.noreply.github.com> Date: Fri, 17 May 2024 13:39:39 +0200 Subject: [PATCH 09/10] Update docker-compose.develop.yml --- docker-compose.develop.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.develop.yml b/docker-compose.develop.yml index 3f54367..94b783e 100644 --- a/docker-compose.develop.yml +++ b/docker-compose.develop.yml @@ -24,8 +24,8 @@ services: rdfconverter: container_name: rdfconverter build: . - expose: - - ${CONVERTER_PORT} + ports: + - ${APP_PORT}:${CONVERTER_PORT} restart: always networks: - rdfconverter_net From 739514625a41b3b6df7a2042c597828adefefd9d Mon Sep 17 00:00:00 2001 From: Thomas Hanke <38633260+ThHanke@users.noreply.github.com> Date: Fri, 17 May 2024 13:44:08 +0200 Subject: [PATCH 10/10] Update TestExamples.yml --- .github/workflows/TestExamples.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/TestExamples.yml b/.github/workflows/TestExamples.yml index d164b33..9bb992b 100644 --- a/.github/workflows/TestExamples.yml +++ b/.github/workflows/TestExamples.yml @@ -11,6 +11,7 @@ env: WORKING_DIR: ./examples/ MAPPING_URL: 'https://github.com/Mat-O-Lab/MapToMethod/raw/main/examples/example-map.yaml' PARSER_PORT: 3001 + APP_MODE: "development" APP_PORT: 5003 MAPPER_PORT: 4000 CONVERTER_PORT: 5000