Merge branch 'master' into dev

This commit is contained in:
Mike Cao 2022-09-12 14:38:50 -07:00
commit ea427f9366
2 changed files with 4 additions and 5 deletions

View File

@ -71,7 +71,7 @@ or change the [port](https://nextjs.org/docs/api-reference/cli#production) to se
To build the umami container and start up a Postgres database, run: To build the umami container and start up a Postgres database, run:
```bash ```bash
docker-compose up docker compose up
``` ```
Alternatively, to pull just the Umami Docker image with PostgreSQL support: Alternatively, to pull just the Umami Docker image with PostgreSQL support:
@ -97,8 +97,8 @@ yarn build
To update the Docker image, simply pull the new images and rebuild: To update the Docker image, simply pull the new images and rebuild:
```bash ```bash
docker-compose pull docker compose pull
docker-compose up --force-recreate docker compose up --force-recreate
``` ```
## License ## License

View File

@ -12,12 +12,11 @@
"scripts": { "scripts": {
"dev": "next dev", "dev": "next dev",
"build": "npm-run-all build-db check-db build-tracker build-geo build-app", "build": "npm-run-all build-db check-db build-tracker build-geo build-app",
"start": "start-next", "start": "next start",
"build-docker": "npm-run-all build-db build-tracker build-geo build-app", "build-docker": "npm-run-all build-db build-tracker build-geo build-app",
"start-docker": "npm-run-all check-db update-tracker start-server", "start-docker": "npm-run-all check-db update-tracker start-server",
"start-env": "node scripts/start-env.js", "start-env": "node scripts/start-env.js",
"start-server": "node server.js", "start-server": "node server.js",
"start-next": "next start",
"build-app": "next build", "build-app": "next build",
"build-tracker": "rollup -c rollup.tracker.config.js", "build-tracker": "rollup -c rollup.tracker.config.js",
"build-db": "npm-run-all copy-db-files build-db-client", "build-db": "npm-run-all copy-db-files build-db-client",