admin/hermione-fe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

reverted dns changes

Browse Source
This commit is contained in:
Sumedh
2024-08-13 05:58:23 +00:00
parent 2fd34115b9
commit dd977abb98
2 changed files with 2 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
.gitlab-ci.yml
View File

@@ -3,8 +3,7 @@ docker-build:
stage: build stage: build
variables: variables:
DOCKER_IMAGE_NAME: olytest/hermione-fe:$CI_COMMIT_SHORT_SHA 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-service.olympus.svc.cluster.local:8080/hermione
VITE_BACKEND_URL: http://olympus-gateway.gcp.it/hermione
before_script: before_script:
- > - >
echo '{ echo '{
@@ -19,9 +18,7 @@ docker-build:
--context "${CI_PROJECT_DIR}" --context "${CI_PROJECT_DIR}"
--dockerfile "${CI_PROJECT_DIR}/Dockerfile" --dockerfile "${CI_PROJECT_DIR}/Dockerfile"
--destination "${DOCKER_IMAGE_NAME}" --destination "${DOCKER_IMAGE_NAME}"
--build-arg "VITE_BACKEND_URL=http://olympus-gateway.gcp.it/hermione" --build-arg "VITE_BACKEND_URL=${VITE_BACKEND_URL}"
--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 # Run this job in a branch where a Dockerfile exists
rules: rules:
- if: $CI_COMMIT_BRANCH - if: $CI_COMMIT_BRANCH

7
Dockerfile
View File

@@ -22,13 +22,6 @@ RUN npm run build
FROM nginx:latest as prod 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 COPY --from=builder /usr/src/app/dist /usr/share/nginx/html
CMD ["nginx", "-g", "daemon off;"] CMD ["nginx", "-g", "daemon off;"]