From d92e1827736e8e94097f5fa3ea6231545506c6ab Mon Sep 17 00:00:00 2001 From: Administrator Date: Mon, 12 Aug 2024 10:40:11 +0000 Subject: [PATCH 01/14] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d8a4aa1..acd3e1a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -17,7 +17,7 @@ docker-build: --context "${CI_PROJECT_DIR}" --dockerfile "${CI_PROJECT_DIR}/Dockerfile" --destination "${DOCKER_IMAGE_NAME}" - --build-arg "VITE_BACKEND_URL=https://hermione-nu6mvqujsq-ey.a.run.app" + --build-arg "VITE_BACKEND_URL=https://olympus-api-gateway-nu6mvqujsq-ey.a.run.app/hermione" # Run this job in a branch where a Dockerfile exists rules: - if: $CI_COMMIT_BRANCH From ae75976b199f90d5984e06d1e42e196ff27ef8b5 Mon Sep 17 00:00:00 2001 From: Sumedh Date: Tue, 13 Aug 2024 04:57:45 +0000 Subject: [PATCH 02/14] kubernetes gateway url added --- .gitlab-ci.yml | 5 ++++- Dockerfile | 6 ++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index acd3e1a..072162e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,6 +3,8 @@ docker-build: stage: build variables: DOCKER_IMAGE_NAME: olytest/hermione-fe:$CI_COMMIT_SHORT_SHA + LOCAL_DNS: '34.159.118.61 olympus-gateway.gcp.it' + VITE_BACKEND_URL: http://olympus-gateway.gcp.it/hermione before_script: - > echo '{ @@ -17,7 +19,8 @@ docker-build: --context "${CI_PROJECT_DIR}" --dockerfile "${CI_PROJECT_DIR}/Dockerfile" --destination "${DOCKER_IMAGE_NAME}" - --build-arg "VITE_BACKEND_URL=https://olympus-api-gateway-nu6mvqujsq-ey.a.run.app/hermione" + --build-arg "VITE_BACKEND_URL=${VITE_BACKEND_URL}" + --build-arg "LOCAL_DNS=${LOCAL_DNS}" # Run this job in a branch where a Dockerfile exists rules: - if: $CI_COMMIT_BRANCH diff --git a/Dockerfile b/Dockerfile index 7412688..963c4a1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,6 +4,12 @@ WORKDIR /usr/src/app # this will allow us to run vite and other tools directly ENV PATH /usr/src/node_modules/.bin:$PATH +# Add custom DNS mapping +ARG LOCAL_DNS +RUN echo "$LOCAL_DNS" >> /etc/hosts + +RUN cat /etc/hosts + # inject all environment vars we'll need ARG VITE_BACKEND_URL ENV VITE_BACKEND_URL=$VITE_BACKEND_URL From 42d275d4fae3f619b3ab4557f031b8d4d935374f Mon Sep 17 00:00:00 2001 From: Sumedh Date: Tue, 13 Aug 2024 05:06:48 +0000 Subject: [PATCH 03/14] local dns modified for nginx --- Dockerfile | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 963c4a1..1d49249 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,16 +4,13 @@ WORKDIR /usr/src/app # this will allow us to run vite and other tools directly ENV PATH /usr/src/node_modules/.bin:$PATH -# Add custom DNS mapping -ARG LOCAL_DNS -RUN echo "$LOCAL_DNS" >> /etc/hosts - -RUN cat /etc/hosts # inject all environment vars we'll need ARG VITE_BACKEND_URL ENV VITE_BACKEND_URL=$VITE_BACKEND_URL +RUN echo $VITE_BACKEND_URL + COPY package.json ./ RUN npm install @@ -25,6 +22,12 @@ RUN npm run build FROM nginx:latest as prod +# Add custom DNS mapping +ARG LOCAL_DNS +RUN echo "$LOCAL_DNS" >> /etc/hosts + +RUN cat /etc/hosts + COPY --from=builder /usr/src/app/dist /usr/share/nginx/html CMD ["nginx", "-g", "daemon off;"] From 2fd34115b9791be6092437525e7c87e24960da7b Mon Sep 17 00:00:00 2001 From: Sumedh Date: Tue, 13 Aug 2024 05:31:13 +0000 Subject: [PATCH 04/14] direct values provided --- .gitlab-ci.yml | 5 +++-- Dockerfile | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 072162e..9827cce 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -19,8 +19,9 @@ docker-build: --context "${CI_PROJECT_DIR}" --dockerfile "${CI_PROJECT_DIR}/Dockerfile" --destination "${DOCKER_IMAGE_NAME}" - --build-arg "VITE_BACKEND_URL=${VITE_BACKEND_URL}" - --build-arg "LOCAL_DNS=${LOCAL_DNS}" + --build-arg "VITE_BACKEND_URL=http://olympus-gateway.gcp.it/hermione" + --build-arg "IP_ADDRESS=34.159.118.61" + --build-arg "LOCAL_DNS=olympus-gateway.gcp.it" # Run this job in a branch where a Dockerfile exists rules: - if: $CI_COMMIT_BRANCH diff --git a/Dockerfile b/Dockerfile index 1d49249..4a4d99a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -24,7 +24,8 @@ FROM nginx:latest as prod # Add custom DNS mapping ARG LOCAL_DNS -RUN echo "$LOCAL_DNS" >> /etc/hosts +ARG IP_ADDRESS +RUN echo "$IP_ADDRESS $LOCAL_DNS" >> /etc/hosts RUN cat /etc/hosts From dd977abb9863b2a85aa029efbb2a7bf650e92220 Mon Sep 17 00:00:00 2001 From: Sumedh Date: Tue, 13 Aug 2024 05:58:23 +0000 Subject: [PATCH 05/14] reverted dns changes --- .gitlab-ci.yml | 7 ++----- Dockerfile | 7 ------- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9827cce..6aaf0de 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,8 +3,7 @@ docker-build: stage: build variables: DOCKER_IMAGE_NAME: olytest/hermione-fe:$CI_COMMIT_SHORT_SHA - LOCAL_DNS: '34.159.118.61 olympus-gateway.gcp.it' - VITE_BACKEND_URL: http://olympus-gateway.gcp.it/hermione + VITE_BACKEND_URL: http://olympus-gateway-service.olympus.svc.cluster.local:8080/hermione before_script: - > echo '{ @@ -19,9 +18,7 @@ docker-build: --context "${CI_PROJECT_DIR}" --dockerfile "${CI_PROJECT_DIR}/Dockerfile" --destination "${DOCKER_IMAGE_NAME}" - --build-arg "VITE_BACKEND_URL=http://olympus-gateway.gcp.it/hermione" - --build-arg "IP_ADDRESS=34.159.118.61" - --build-arg "LOCAL_DNS=olympus-gateway.gcp.it" + --build-arg "VITE_BACKEND_URL=${VITE_BACKEND_URL}" # Run this job in a branch where a Dockerfile exists rules: - if: $CI_COMMIT_BRANCH diff --git a/Dockerfile b/Dockerfile index 4a4d99a..5d8ff99 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,13 +22,6 @@ RUN npm run build FROM nginx:latest as prod -# Add custom DNS mapping -ARG LOCAL_DNS -ARG IP_ADDRESS -RUN echo "$IP_ADDRESS $LOCAL_DNS" >> /etc/hosts - -RUN cat /etc/hosts - COPY --from=builder /usr/src/app/dist /usr/share/nginx/html CMD ["nginx", "-g", "daemon off;"] From 97c751c980ec7ef6d751eed9454406e4d3c7decb Mon Sep 17 00:00:00 2001 From: Sumedh Date: Tue, 13 Aug 2024 06:17:42 +0000 Subject: [PATCH 06/14] hermione url updated --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6aaf0de..a90eb93 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,7 +3,7 @@ docker-build: stage: build variables: DOCKER_IMAGE_NAME: olytest/hermione-fe:$CI_COMMIT_SHORT_SHA - VITE_BACKEND_URL: http://olympus-gateway-service.olympus.svc.cluster.local:8080/hermione + VITE_BACKEND_URL: http://hermione-fe-gateway.gcp.it:8080/hermione before_script: - > echo '{ From c246a7bce2e5edcc22bdcd1b4769b4fc9f1ace5d Mon Sep 17 00:00:00 2001 From: Sumedh Date: Tue, 13 Aug 2024 06:25:02 +0000 Subject: [PATCH 07/14] url corrected --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a90eb93..28b1b1f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,7 +3,7 @@ docker-build: stage: build variables: DOCKER_IMAGE_NAME: olytest/hermione-fe:$CI_COMMIT_SHORT_SHA - VITE_BACKEND_URL: http://hermione-fe-gateway.gcp.it:8080/hermione + VITE_BACKEND_URL: http://olympus-gateway.gcp.it:8080/hermione before_script: - > echo '{ From 9fd390387d2eb6413627648f3919d203da3bb611 Mon Sep 17 00:00:00 2001 From: Sumedh Date: Tue, 13 Aug 2024 06:31:23 +0000 Subject: [PATCH 08/14] port removed --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 28b1b1f..834df9d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,7 +3,7 @@ docker-build: stage: build variables: DOCKER_IMAGE_NAME: olytest/hermione-fe:$CI_COMMIT_SHORT_SHA - VITE_BACKEND_URL: http://olympus-gateway.gcp.it:8080/hermione + VITE_BACKEND_URL: http://olympus-gateway.gcp.it/hermione before_script: - > echo '{ From fd766a692158b0fb99dc6d3366f45c6b15834717 Mon Sep 17 00:00:00 2001 From: Sumedh Date: Tue, 13 Aug 2024 08:07:22 +0000 Subject: [PATCH 09/14] vite backend url modified --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 834df9d..d1f7ac7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,7 +3,7 @@ docker-build: stage: build variables: DOCKER_IMAGE_NAME: olytest/hermione-fe:$CI_COMMIT_SHORT_SHA - VITE_BACKEND_URL: http://olympus-gateway.gcp.it/hermione + VITE_BACKEND_URL: http://gateway.olympusai.app/hermione before_script: - > echo '{ From 3038ab397b2047ccc8d15d615dfcb1ecaf2b761f Mon Sep 17 00:00:00 2001 From: Administrator Date: Tue, 13 Aug 2024 13:15:47 +0000 Subject: [PATCH 10/14] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d1f7ac7..c04cf2e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,7 +3,7 @@ docker-build: stage: build variables: DOCKER_IMAGE_NAME: olytest/hermione-fe:$CI_COMMIT_SHORT_SHA - VITE_BACKEND_URL: http://gateway.olympusai.app/hermione + VITE_BACKEND_URL: http://gateway.olympusai.live/hermione before_script: - > echo '{ From f34f30ce2aeff98044b3143fa0973d97df035ca8 Mon Sep 17 00:00:00 2001 From: Administrator Date: Tue, 13 Aug 2024 13:19:05 +0000 Subject: [PATCH 11/14] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c04cf2e..8780b4b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,7 +3,7 @@ docker-build: stage: build variables: DOCKER_IMAGE_NAME: olytest/hermione-fe:$CI_COMMIT_SHORT_SHA - VITE_BACKEND_URL: http://gateway.olympusai.live/hermione + VITE_BACKEND_URL: http://olympus-api-gateway.olympusai.live/hermione before_script: - > echo '{ From 19af3691382862688360bea6aa3d5e4223454ce7 Mon Sep 17 00:00:00 2001 From: Administrator Date: Wed, 14 Aug 2024 08:45:14 +0000 Subject: [PATCH 12/14] fix 404 --- Dockerfile | 2 ++ default.conf | 22 ++++++++++++++++++++++ 2 files changed, 24 insertions(+) create mode 100644 default.conf diff --git a/Dockerfile b/Dockerfile index 5d8ff99..6f114f0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -23,5 +23,7 @@ RUN npm run build FROM nginx:latest as prod COPY --from=builder /usr/src/app/dist /usr/share/nginx/html +ADD default.conf /etc/nginx/conf.d/default.conf + CMD ["nginx", "-g", "daemon off;"] diff --git a/default.conf b/default.conf new file mode 100644 index 0000000..8e58f9b --- /dev/null +++ b/default.conf @@ -0,0 +1,22 @@ +server { + listen 80; + listen [::]:80; + server_name localhost; + + #access_log /var/log/nginx/host.access.log main; + + location / { + try_files $uri $uri/ /index.html; + } + + #error_page 404 /404.html; + + # redirect server error pages to the static page /50x.html + # + error_page 500 502 503 504 /50x.html; + location = /50x.html { + root /usr/share/nginx/html; + } + + +} From 450239e0b2fe66850a9c1b76ee7b2f552ea80c2f Mon Sep 17 00:00:00 2001 From: Administrator Date: Wed, 14 Aug 2024 08:54:30 +0000 Subject: [PATCH 13/14] Update file default.conf --- default.conf | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/default.conf b/default.conf index 8e58f9b..8860720 100644 --- a/default.conf +++ b/default.conf @@ -4,6 +4,10 @@ server { server_name localhost; #access_log /var/log/nginx/host.access.log main; + root /usr/share/nginx/html; + index index.html index.htm; + + server_name _; location / { try_files $uri $uri/ /index.html; @@ -19,4 +23,4 @@ server { } -} +} \ No newline at end of file From db0db959411a544521498792f82630eb3cca7327 Mon Sep 17 00:00:00 2001 From: "paola.trabucco" Date: Wed, 28 Aug 2024 10:38:03 +0200 Subject: [PATCH 14/14] askHermione/rephrase/summarize --- src/views/pages/canvas/Canvas.vue | 158 ++++++++++++++++-- src/views/pages/canvas/MdCanvas.vue | 135 +++++++++++++-- .../pages/canvas/ScenarioExecutionDialog.vue | 16 +- 3 files changed, 275 insertions(+), 34 deletions(-) diff --git a/src/views/pages/canvas/Canvas.vue b/src/views/pages/canvas/Canvas.vue index e9e8b69..6abb9fc 100644 --- a/src/views/pages/canvas/Canvas.vue +++ b/src/views/pages/canvas/Canvas.vue @@ -3,16 +3,40 @@ + +
+
+ +
+
+
+
+ +
+ +
+ +
+
+ +
+
+ +
+
+