# Conflicts:
#	src/views/pages/ScenarioExec.vue
This commit is contained in:
paola.trabucco
2024-08-08 15:07:23 +02:00
4 changed files with 57 additions and 4 deletions

27
.gitlab-ci.yml Normal file
View File

@@ -0,0 +1,27 @@
docker-build:
image: gcr.io/kaniko-project/executor:debug
stage: build
variables:
DOCKER_IMAGE_NAME: olytest/hermione-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

24
Dockerfile Normal file
View File

@@ -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;"]

View File

@@ -2,7 +2,7 @@ import axios from 'axios';
export const ScenarioService = { export const ScenarioService = {
getScenarios() { getScenarios() {
return axios.get('http://localhost:8081/scenarios') return axios.get('/scenarios')
} }
} }

View File

@@ -127,7 +127,8 @@ const debug_modal = ref(false)
onMounted(() => { onMounted(() => {
loading.value = true loading.value = true
const id = route.params.id; const id = route.params.id;
axios.get('http://localhost:8081/scenarios/' + id )
axios.get('/scenarios/' + id )
.then(response => { .then(response => {
loading.value = false loading.value = false
scenario.value = response.data scenario.value = response.data
@@ -156,7 +157,7 @@ onMounted(() => {
inputs: { ...formData.value } inputs: { ...formData.value }
}; };
axios.post('http://localhost:8081/scenarios/execute', data) axios.post('/scenarios/execute', data)
.then(response => { .then(response => {
loading_data.value = false; loading_data.value = false;
data_loaded.value = true; data_loaded.value = true;
@@ -174,7 +175,8 @@ onMounted(() => {
} }
const openDebug = () => { const openDebug = () => {
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 exec_scenario.value = resp.data
debug_modal.value = true debug_modal.value = true
}) })