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.

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

Update to latest version of frontend and backend, including runtime config support for the frontend #3

Merged
merged 5 commits into from
Apr 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 0 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,16 +60,6 @@ Docker Compose, we suggest looking at including
https://github.com/nginx-proxy/acme-companion into your `docker-compose.yml`
(or maybe preferably, into `docker-compose.override.yml`).

### UI configuration

As it stands, the front-end user interface is a React/TypeScript application,
where the configuration is compiled statically into the resulting JavaScript
code files. This means all the configuration options are build-time options,
not run-time options.

I.e every configuration change you make in [`.env`](./.env) that affects the frontend
will cause a re-build of the frontend image and containers.

### Troubleshooting on MacOS

The images referred to by `docker-compose.yml` are hosted as GitHub packages on
Expand Down
24 changes: 11 additions & 13 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,25 +1,23 @@
version: '3.5'
services:
frontend:
build:
context: frontend
args:
- VERSION=1.6.1
- REACT_APP_BACKEND_URL=${ARGUS_BACKEND_URL}
- REACT_APP_ENABLE_WEBSOCKETS_SUPPORT=true
- REACT_APP_BACKEND_WS_URL=${ARGUS_BACKEND_WEBSOCKET_URL}
- REACT_APP_USE_SECURE_COOKIE=false
- REACT_APP_DEBUG=false
- REACT_APP_DEFAULT_AUTO_REFRESH_INTERVAL=30
- REACT_APP_REALTIME_SERVICE_MAX_RETRIES=5
- REACT_APP_COOKIE_DOMAIN=${ARGUS_DOMAIN}
image: ghcr.io/uninett/argus-frontend:1.13.0
environment:
- REACT_APP_BACKEND_URL=${ARGUS_BACKEND_URL}
- REACT_APP_ENABLE_WEBSOCKETS_SUPPORT=true
- REACT_APP_BACKEND_WS_URL=${ARGUS_BACKEND_WEBSOCKET_URL}
- REACT_APP_USE_SECURE_COOKIE=false
- REACT_APP_DEBUG=false
- REACT_APP_DEFAULT_AUTO_REFRESH_INTERVAL=30
- REACT_APP_REALTIME_SERVICE_MAX_RETRIES=5
- REACT_APP_COOKIE_DOMAIN=${ARGUS_DOMAIN}
depends_on:
- api
ports:
- "${ARGUS_FRONTEND_PORT}:8080"

api:
image: ghcr.io/uninett/argus:1.9.0
image: ghcr.io/uninett/argus:1.15.0

ports:
- "${ARGUS_BACKEND_PORT}:8000"
Expand Down
29 changes: 0 additions & 29 deletions frontend/Dockerfile

This file was deleted.

21 changes: 0 additions & 21 deletions frontend/Dockerfile-build

This file was deleted.

6 changes: 0 additions & 6 deletions frontend/docker-entrypoint.sh

This file was deleted.

9 changes: 0 additions & 9 deletions frontend/nginx.conf

This file was deleted.

Loading