From 45dd9cfdbae1be91c61f2e7010007b7d3c1d24dc Mon Sep 17 00:00:00 2001 From: Administrator Date: Thu, 8 Aug 2024 09:34:59 +0000 Subject: [PATCH 1/3] Update 2 files - /Dockerfile - /.gitlab-ci.yml --- .gitlab-ci.yml | 27 +++++++++++++++++++++++++++ Dockerfile | 24 ++++++++++++++++++++++++ 2 files changed, 51 insertions(+) create mode 100644 .gitlab-ci.yml create mode 100644 Dockerfile diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000..187c08a --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,27 @@ +docker-build: + image: gcr.io/kaniko-project/executor:debug + stage: build + variables: + DOCKER_IMAGE_NAME: olytest/aradne-fe:$CI_COMMIT_SHORT_SHA + before_script: + - > + echo '{ + "auths": { + "https://index.docker.io/v1/": { + "auth": "b2x5dGVzdDpkY2tyX3BhdF9ZUFBCa21IVlVkbmx4R3dLT0t1TEtmQ1RTVTg=" + } + } + } ' >> /kaniko/.docker/config.json + script: + - /kaniko/executor + --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" + # Run this job in a branch where a Dockerfile exists + rules: + - if: $CI_COMMIT_BRANCH + exists: + - Dockerfile + tags: + - OLYMPUS diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..7412688 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,24 @@ +FROM node:latest as builder + +WORKDIR /usr/src/app +# this will allow us to run vite and other tools directly +ENV PATH /usr/src/node_modules/.bin:$PATH + +# inject all environment vars we'll need +ARG VITE_BACKEND_URL +ENV VITE_BACKEND_URL=$VITE_BACKEND_URL + +COPY package.json ./ + +RUN npm install + +COPY . ./ + +RUN npm run build + + +FROM nginx:latest as prod + +COPY --from=builder /usr/src/app/dist /usr/share/nginx/html + +CMD ["nginx", "-g", "daemon off;"] From 3a95228ea7e6d9623023325b0e31bdb468fb325c Mon Sep 17 00:00:00 2001 From: Administrator Date: Thu, 8 Aug 2024 09:39:59 +0000 Subject: [PATCH 2/3] Update file .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 187c08a..d8a4aa1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,7 +2,7 @@ docker-build: image: gcr.io/kaniko-project/executor:debug stage: build variables: - DOCKER_IMAGE_NAME: olytest/aradne-fe:$CI_COMMIT_SHORT_SHA + DOCKER_IMAGE_NAME: olytest/hermione-fe:$CI_COMMIT_SHORT_SHA before_script: - > echo '{ From acc5771bbf0d20a23e246b66c37b4184e1a64842 Mon Sep 17 00:00:00 2001 From: Administrator Date: Thu, 8 Aug 2024 10:14:08 +0000 Subject: [PATCH 3/3] Update 2 files - /src/service/ScenarioService.js - /src/views/pages/ScenarioExec.vue --- src/service/ScenarioService.js | 2 +- src/views/pages/ScenarioExec.vue | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/service/ScenarioService.js b/src/service/ScenarioService.js index df5341e..febbec1 100644 --- a/src/service/ScenarioService.js +++ b/src/service/ScenarioService.js @@ -2,7 +2,7 @@ import axios from 'axios'; export const ScenarioService = { getScenarios() { - return axios.get('http://localhost:8081/scenarios') + return axios.get('/scenarios') } } \ No newline at end of file diff --git a/src/views/pages/ScenarioExec.vue b/src/views/pages/ScenarioExec.vue index 4b437ed..4055e57 100644 --- a/src/views/pages/ScenarioExec.vue +++ b/src/views/pages/ScenarioExec.vue @@ -128,7 +128,7 @@ onMounted(() => { loading.value = true const id = route.params.id; console.log(id) - axios.get('http://localhost:8081/scenarios/' + id ) + axios.get('/scenarios/' + id ) .then(response => { console.log(response); loading.value = false @@ -160,7 +160,7 @@ onMounted(() => { console.log(data); - axios.post('http://localhost:8081/scenarios/execute', data) + axios.post('/scenarios/execute', data) .then(response => { loading_data.value = false; data_loaded.value = true; @@ -180,7 +180,7 @@ onMounted(() => { const openDebug = () => { console.log("exec_id", exec_id.value) - axios.get('http://localhost:8081/scenarios/execute/'+ exec_id.value).then(resp =>{ + axios.get('/scenarios/execute/'+ exec_id.value).then(resp =>{ exec_scenario.value = resp.data console.log(exec_scenario.value)