Skip to content

Commit f00f1bd

Browse files
refactor: Unifies docker compose files
1 parent f83e115 commit f00f1bd

3 files changed

Lines changed: 12 additions & 32 deletions

File tree

DEVELOPMENT_GUIDE.md

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,14 @@ yarn dev
2020
1. Build the back-end, inject it into a docker image, and run it alongside a Haxall server:
2121

2222
```bash
23-
mage -v && docker compose -f docker-compose_dev.yaml up
23+
mage -v && docker compose up
2424
```
2525

2626
## Usage
2727

28-
Create a new data source and select "Haystack". If no Docker configuration has been edited, the Haystack API is available at
29-
`http://haxall:8080/api/`, with the username `su` and password `su`. Click "Save and Test" and make sure that it is
30-
working.
28+
An example datasource and dashboard are created by the provisioning system.
3129

32-
Create a new dashboard and panel, and use this axon query to test the connection:
30+
If you'd like to create a new dashboard and panel, you use this axon query to test the connection:
3331

3432
```
3533
[{ts: now()-1hr, v0: 0}, {ts: now(), v0: 10}].toGrid

docker-compose.yaml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,12 @@ services:
77
extends:
88
file: .config/docker-compose-base.yaml
99
service: grafana
10+
haxall:
11+
image: "needleinajaystack/haxall:latest"
12+
environment:
13+
- SU_USER=su
14+
- SU_PASS=su
15+
ports:
16+
- 8080:8080/tcp
17+
volumes:
18+
- ~/haxall/proj:/opt/haxall/proj

docker-compose_dev.yaml

Lines changed: 0 additions & 27 deletions
This file was deleted.

0 commit comments

Comments
 (0)