mirror of
https://github.com/Chewbaccalakis/rfid-database.git
synced 2026-09-09 16:01:56 -07:00
Fix leftover merge conflict markers in Docker files
The previous merge commit accidentally retained <<<<<<< markers in Dockerfile, README, and .env.example, which broke docker compose build.
This commit is contained in:
@@ -86,7 +86,6 @@ GitHub Actions runs lint, typecheck, and tests on every pull request and push to
|
||||
|
||||
## Docker
|
||||
|
||||
<<<<<<< HEAD
|
||||
### docker compose (recommended)
|
||||
|
||||
```bash
|
||||
@@ -117,26 +116,16 @@ docker compose down
|
||||
|
||||
### Plain docker
|
||||
|
||||
=======
|
||||
>>>>>>> origin/main
|
||||
```bash
|
||||
docker build -t rfid-database .
|
||||
docker run --rm -p 3000:3000 \
|
||||
-e AUTH_SECRET=your-long-secret \
|
||||
<<<<<<< HEAD
|
||||
-e CREATE_USER_EMAIL=[email protected] \
|
||||
-e CREATE_USER_PASSWORD=changeme \
|
||||
=======
|
||||
>>>>>>> origin/main
|
||||
-v rfid-data:/data \
|
||||
rfid-database
|
||||
```
|
||||
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
Create the first user against the mounted DB (exec into the container or run `create-user` with `RFID_DB_PATH` pointed at the volume).
|
||||
|
||||
>>>>>>> origin/main
|
||||
## Security
|
||||
|
||||
Tag dumps often include sector keys. Keep the app behind HTTPS, do not expose it publicly without auth, and treat `data/rfid.db` as sensitive.
|
||||
|
||||
Reference in New Issue
Block a user