Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: update ui port for development environments #415

Merged
merged 7 commits into from
Sep 22, 2023
Merged

chore: update ui port for development environments #415

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
34a9d38
chore: update ui port for development environments
Alex-Izquierdo Sep 21, 2023
bacb0ec
update ws base url for macs
Alex-Izquierdo Sep 21, 2023
67a9696
fix ports
Alex-Izquierdo Sep 21, 2023
67a419b
update svc port in eda-kube.sh
Alex-Izquierdo Sep 22, 2023
2d35cb5
Merge branch 'main' into fix-ui-port
Alex-Izquierdo Sep 22, 2023
6531d13
revert changes for minikube
Alex-Izquierdo Sep 22, 2023
11e2f15
Merge branch 'main' into fix-ui-port
bzwei Sep 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion tools/docker/docker-compose-dev.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ services:
image: "${EDA_UI_IMAGE:-quay.io/ansible/eda-ui:main}"
environment: *common-env
ports:
- '8080:8080'
- '8443:443'
depends_on:
eda-api:
condition: service_healthy
Expand Down
4 changes: 2 additions & 2 deletions tools/docker/docker-compose-mac.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ x-environment:
- EDA_SECRET_KEY=secret
- EDA_ALLOWED_HOSTS=['*']
- EDA_DEPLOYMENT_TYPE=podman
- EDA_WEBSOCKET_BASE_URL=${EDA_WEBSOCKET_BASE_URL:-ws://host.containers.internal:8080}
- EDA_WEBSOCKET_BASE_URL=${EDA_WEBSOCKET_BASE_URL:-wss://host.containers.internal:8443}
- EDA_WEBSOCKET_SSL_VERIFY=no
- EDA_PODMAN_SOCKET_URL="unix:///run/podman/podman.sock"
- EDA_CONTROLLER_URL=${EDA_CONTROLLER_URL:?Please specify EDA_CONTROLLER_URL env}
Expand All @@ -21,7 +21,7 @@ services:
image: "${EDA_UI_IMAGE:-quay.io/ansible/eda-ui:main}"
environment: *common-env
ports:
- '8080:8080'
- '8443:443'
depends_on:
eda-api:
condition: service_healthy
Expand Down
2 changes: 1 addition & 1 deletion tools/docker/docker-compose-stage.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ services:
image: "${EDA_UI_IMAGE:-quay.io/ansible/eda-ui:main}"
environment: *common-env
ports:
- '8080:8080'
- '8443:443'
depends_on:
eda-api:
condition: service_healthy
Expand Down