chore: bring back ui to docker-compose - AAP-34942 (#1130)

Signed-off-by: Alex <aizquier@redhat.com>

Author: Alex-Izquierdo

docs/deployment.md

@@ -72,7 +72,7 @@ You can start all services with:
 docker-compose -p eda -f docker-compose-stage.yaml up
 ```
 
-Note: **You can use the environment variables `EDA_IMAGE_URL` and `EDA_UI_IMAGE_URL` to use a different image url. By default is the latest code from the main branch.**
+Note: **You can use the environment variables `EDA_IMAGE_URL` and `EDA_UI_IMAGE` to use a different image url. By default is the latest code from the main branch.**
 
 ## Deploy using Minikube and Taskfile
 
@@ -124,3 +124,5 @@ Minikube is the recommended method for macOS users
 
 You can now inspect the API documentation at <https://localhost:8443/api/eda/v1/docs>
 or navigate through the resources with the DRF browsable API at <https://localhost:8443/api/eda/v1/>
+
+You can also access the standalone UI at <http://localhost:8443/> with the default credentials `admin`/`testpass`.

docs/development.md

@@ -247,8 +247,10 @@ environment variables:
 * `EDA_DB_NAME` – Database name (default: `eda`)
 
 ### TLS-enabled redis
+
 If you wish to run a development environment requiring TLS connections to redis it is a simple
 process...
+
 1. build your container images as described above
 2. start them using `docker-compose -f ./tools/docker/docker-compose-dev-redis-tls.yaml up`
 
@@ -388,4 +390,5 @@ task format:isort
 task format:black
 ```
 
-You can now access the api at <https://localhost:8443/api/eda/v1/docs> with default login username and password(admin/testpass).
+You can now access the api at <https://localhost:8443/api/eda/v1/docs> with the default credentials `admin`/`testpass`.
+You can also access the standalone UI at <http://localhost:8443/>.

docs/mac_development.md

@@ -1,17 +1,17 @@
 # Development with podman on Mac
 
-If you are developing on Mac with podman this document will guide you thru the steps you need to 
+If you are developing on Mac with podman this document will guide you thru the steps you need to
+
 1. Successfully run the product using podman
 2. Make development changes and run product using your local changes
 
 # Pre Requisites
+
 1. podman: [Podman for Mac](https://podman.io/getting-started/installation#macos)
 2. docker-compose: [Docker for Mac](https://www.docker.com/docker-mac)
 
-
-
-
 ### One time setup
+
 1. brew install podman
 2. podman machine init --cpus 2 --memory 2048 --disk-size 100 --now
 3. alias docker=podman
@@ -32,26 +32,32 @@ If the value of userid is not 501
 export EDA_HOST_PODMAN_SOCKET_URL=/run/user/{your_uid}/podman/podman.sock
 
 ### No docker installed
+
 No addtional steps needed
 
 ### With docker installed
+
 We need to create a SSH tunnel between the Mac and the podman vm created above, we need the following steps
+
 1. podman system connection ls
+
 ```
 Name URI Identity  Default
 
 podman-machine-default ssh://core@localhost:49473/run/user/501/podman/podman.sock
 ```
+
 example use the uid 501 above and port 49473 from your enviornment in the next step
 
-2. Create a secure tunnel, and forward the local socket to the remote socket 
+2. Create a secure tunnel, and forward the local socket to the remote socket
+
 ```
 ssh -fnNT -L/tmp/podman.sock:/run/user/{uid}/podman/podman.sock -i ~/.ssh/podman-machine-default ssh://core@localhost:{port} -o StreamLocalBindUnlink=yes
 
 ps aux | grep "ssh -fnNT" |grep -v color
 ```
-3. export DOCKER_HOST=unix:///tmp/podman.sock
 
+3. export DOCKER_HOST=unix:///tmp/podman.sock
 
 ## Start the app with available images in quay.io
 
@@ -68,7 +74,9 @@ You can build an image with your changes and use that image in docker-compose
 2. export EDA_IMAGE=localhost/myserver:latest
 3. docker-compose -f ./tools/docker/docker-compose-mac.yml up
 
-You can now access the api at <https://localhost:8443/api/eda/v1/docs/> with default login username and password(admin/testpass).
+You can now access the api at <https://localhost:8443/api/eda/v1/docs> with the default credentials `admin`/`testpass`.
+You can also access the standalone UI at <http://localhost:8443/>.
 
 ## Layout
+
 ![Alt_PodmanDeployment](./podman_deployment.png?raw=true)

tools/docker/docker-compose-dev-redis-tls.yaml

@@ -44,7 +44,7 @@ x-environment:
   - EDA_RESOURCE_SERVER__VALIDATE_HTTPS=${EDA_RESOURCE_SERVER__VALIDATE_HTTPS:-False}
   - EDA_RESOURCE_JWT_USER_ID=${EDA_RESOURCE_JWT_USER_ID:-'@none None'}
   - EDA_ANSIBLE_BASE_MANAGED_ROLE_REGISTRY=${EDA_ANSIBLE_BASE_MANAGED_ROLE_REGISTRY:-@json {}}
-  - EDA_STATIC_URL=${EDA_STATIC_URL:-api/eda/static/}
+  - EDA_STATIC_URL=${EDA_STATIC_URL:-api/eda/v1/static/}
   - SSL_CERTIFICATE=${SSL_CERTIFICATE:-/certs/wildcard.crt}
   - SSL_CERTIFICATE_KEY=${SSL_CERTIFICATE_KEY:-/certs/wildcard.key}
   - SSL_CLIENT_CERTIFICATE=${SSL_CLIENT_CERTIFICATE:-/certs/client.crt}
@@ -233,8 +233,8 @@ services:
       - '../../:/app/src:z'
     restart: always
 
-  eda-nginx:
-    image: ${EDA_NGINX_IMAGE:-docker.io/nginx:alpine}
+  eda-ui:
+    image: ${EDA_UI_IMAGE:-quay.io/ansible/eda-ui:main}
     environment: *common-env
     command: nginx -g "daemon off;"
     ports:

tools/docker/docker-compose-dev.yaml

@@ -48,7 +48,7 @@ x-environment: &common-env
   EDA_EVENT_STREAM_MTLS_BASE_URL: ${EDA_EVENT_STREAM_MTLS_BASE_URL:-https://localhost:8443/mtls/edgecafe-beef-feed-fade-decadeedgecafe/}
   EDA_WEBHOOK_HOST: ${EDA_WEBHOOK_HOST:-eda-webhook-api:8000}
   EDA_WEBHOOK_SERVER: http://${EDA_WEBHOOK_HOST:-eda-webhook-api:8000}
-  EDA_STATIC_URL: ${EDA_STATIC_URL:-api/eda/static/}
+  EDA_STATIC_URL: ${EDA_STATIC_URL:-api/eda/v1/static/}
   SSL_CERTIFICATE: ${SSL_CERTIFICATE:-/certs/wildcard.crt}
   SSL_CERTIFICATE_KEY: ${SSL_CERTIFICATE_KEY:-/certs/wildcard.key}
   SSL_CLIENT_CERTIFICATE: ${SSL_CLIENT_CERTIFICATE:-/certs/client.crt}
@@ -258,10 +258,9 @@ services:
     ports:
       - '${EDA_PROXY_PORT:-3128}:3128'
 
-  eda-nginx:
-    image: ${EDA_NGINX_IMAGE:-docker.io/nginx:alpine}
+  eda-ui:
+    image: ${EDA_UI_IMAGE:-quay.io/ansible/eda-ui:main}
     environment: *common-env
-    command: nginx -g "daemon off;"
     ports:
       - '${EDA_UI_PORT:-8443}:443'
     volumes:

tools/docker/docker-compose-mac.yml

@@ -44,7 +44,7 @@ x-environment:
   - EDA_EVENT_STREAM_MTLS_BASE_URL=${EDA_EVENT_STREAM_MTLS_BASE_URL:-https://localhost:8443/mtls/edgecafe-beef-feed-fade-decadeedgecafe/}
   - EDA_WEBHOOK_HOST=${EDA_WEBHOOK_HOST:-eda-webhook-api:8000}
   - EDA_WEBHOOK_SERVER=http://${EDA_WEBHOOK_HOST:-eda-webhook-api:8000}
-  - EDA_STATIC_URL=${EDA_STATIC_URL:-api/eda/static/}
+  - EDA_STATIC_URL=${EDA_STATIC_URL:-api/eda/v1/static/}
   - SSL_CERTIFICATE=${SSL_CERTIFICATE:-/certs/wildcard.crt}
   - SSL_CERTIFICATE_KEY=${SSL_CERTIFICATE_KEY:-/certs/wildcard.key}
   - SSL_CLIENT_CERTIFICATE=${SSL_CLIENT_CERTIFICATE:-/certs/client.crt}
@@ -210,10 +210,9 @@ services:
     ports:
       - '${EDA_PROXY_PORT:-3128}:3128'
 
-  eda-nginx:
-    image: ${EDA_NGINX_IMAGE:-docker.io/nginx:alpine}
+  eda-ui:
+    image: ${EDA_UI_IMAGE:-quay.io/ansible/eda-ui:main}
     environment: *common-env
-    command: nginx -g "daemon off;"
     ports:
       - '${EDA_UI_PORT:-8443}:443'
     volumes:

tools/docker/docker-compose-stage.yaml

@@ -41,6 +41,7 @@ x-environment:
   - EDA_EVENT_STREAM_MTLS_BASE_URL=${EDA_EVENT_STREAM_MTLS_BASE_URL:-https://localhost:8443/mtls/edgecafe-beef-feed-fade-decadeedgecafe/}
   - EDA_WEBHOOK_HOST=${EDA_WEBHOOK_HOST:-eda-webhook-api:8000}
   - EDA_WEBHOOK_SERVER=http://${EDA_WEBHOOK_HOST:-eda-webhook-api:8000}
+  - EDA_STATIC_URL=${EDA_STATIC_URL:-api/eda/static/}
   - SSL_CERTIFICATE=${SSL_CERTIFICATE:-/certs/wildcard.crt}
   - SSL_CERTIFICATE_KEY=${SSL_CERTIFICATE_KEY:-/certs/wildcard.key}
   - SSL_CLIENT_CERTIFICATE=${SSL_CLIENT_CERTIFICATE:-/certs/client.crt}
@@ -207,8 +208,8 @@ services:
     ports:
       - '${EDA_PROXY_PORT:-3128}:3128'
 
-  eda-nginx:
-    image: ${EDA_NGINX_IMAGE:-docker.io/nginx:alpine}
+  eda-ui:
+    image: ${EDA_UI_IMAGE:-quay.io/ansible/eda-ui:main}
     environment: *common-env
     command: nginx -g "daemon off;"
     ports:

tools/docker/nginx/default.conf.template

@@ -58,11 +58,14 @@ server {
         proxy_set_header Connection "Upgrade";
     }
 
-    location ^~ /static/ {
+    location ^~ /api/eda/static/ {
         alias /staticfiles/;
     }
 
     location / {
-        return 301 https://$host/api/eda/v1/docs;
+        autoindex off;
+        expires off;
+        add_header Cache-Control "public, max-age=0, s-maxage=0, must-revalidate" always;
+        try_files $uri /index.html =404;
     }
 }