Skip to content

Commit

Permalink
Revert "Fix FE url endpoint changing for each deployment environment …
Browse files Browse the repository at this point in the history
…part1"

This reverts commit 3b51d59.
  • Loading branch information
Corgam committed Jun 10, 2024
1 parent 3b51d59 commit d611252
Show file tree
Hide file tree
Showing 9 changed files with 52 additions and 520 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/deploy_production.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ on:
push:
tags:
- sprint-**-release
branches:
- CI-CD

env:
REGISTRY: ghcr.io
Expand Down
2 changes: 0 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@ services:
image: ghcr.io/amosproj/amos2024ss04-building-information-enhancer-frontend:${DOCKER_COMPOSE_IMAGES_TAG}
environment:
- NODE_ENV=${ENVIRONMENT_STAGE}
- VITE_BACKEND_HOST=${VITE_BACKEND_HOST}
- VITE_BACKEND_PORT=${VITE_BACKEND_PORT}
networks:
- bie-network
ports:
Expand Down
12 changes: 10 additions & 2 deletions frontend/.env
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
# Parameters for local deployment
VITE_BACKEND_HOST = "localhost_blabla"
VITE_BACKEND_PORT = 8081
VITE_API_HOST_DEV = "localhost"
VITE_API_PORT_DEV = 8081

# Parameters for test environment deployment
VITE_API_HOST_TEST = "test.amos.b-ci.de"
VITE_API_PORT_TEST = 8081

# Parameters for production environment deployment
VITE_API_HOST_PRODUCTION = "prod.amos.b-ci.de"
VITE_API_PORT_PRODUCTION = 8081
2 changes: 0 additions & 2 deletions frontend/.env.example

This file was deleted.

10 changes: 3 additions & 7 deletions frontend/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,8 @@ FROM httpd:2.4

COPY --from=builder /usr/src/app/dist /usr/local/apache2/htdocs/

# Add the entrypoint script
COPY entrypoint.sh /usr/local/bin/
RUN chmod +x /usr/local/bin/entrypoint.sh

# Expose the port
EXPOSE 80
EXPOSE "${PORT}"

# Start web server using the entrypoint script
ENTRYPOINT ["entrypoint.sh"]
# Start web server
CMD ["httpd-foreground"]
7 changes: 0 additions & 7 deletions frontend/entrypoint.sh

This file was deleted.

Loading

0 comments on commit d611252

Please sign in to comment.