diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md index fdf3ca4d4..1dd970f95 100644 --- a/DEVELOPMENT.md +++ b/DEVELOPMENT.md @@ -68,10 +68,11 @@ export PULSAR_CPP_DIR=/opt/homebrew/Cellar/libpulsar/3.1.0 If you are proxying the webapp according to step 2 then in `webapp/.env`, set the `APP_ORIGIN` to the `NGROK_SUBDOMAIN` provided to the `./scripts/proxy-webapp.sh` command, e.g. `APP_ORIGIN=https://dan-trigger-dev.eu.ngrok.io` -4. Start postgresql, pulsar, and pizzly server +4. Start postgresql, redis, pizzly server, followed by pulsar standalone ```bash - pnpm run docker:db + pnpm run docker:services + pnpm run docker:pulsar ``` > **Note:** The npm script will complete while Docker sets up the container in the background. Ensure that Docker has finished and your container is running before proceeding. @@ -173,7 +174,8 @@ pnpm install 1. Ensure the docker containers are running ```bash -pnpm run docker:db +pnpm run docker:services +pnpm run docker:pulsar ``` 2. Run the webapp diff --git a/docker-compose.yml b/docker-compose.yml index c65c4c7a6..6377e1cd2 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -48,18 +48,6 @@ services: - db networks: - app_network - pulsar: - image: apachepulsar/pulsar:2.10.2 - ports: - - "6650:6650" - - "8080:8080" - volumes: - - "pulsardatav:/pulsar/data" - command: bin/pulsar standalone - container_name: pulsar - tty: true - stdin_open: true - restart: always networks: app_network: diff --git a/package.json b/package.json index 800fc8330..ae1294226 100644 --- a/package.json +++ b/package.json @@ -24,8 +24,10 @@ "format": "prettier --write \"**/*.{ts,tsx,md}\"", "generate": "turbo run generate", "lint": "turbo run lint", - "docker:db": "docker-compose -f docker-compose.yml up -d", - "docker:db:stop": "docker-compose -f docker-compose.yml stop", + "docker:services": "docker-compose -f docker-compose.yml up -d", + "docker:services:stop": "docker-compose -f docker-compose.yml stop", + "docker:pulsar": "docker-compose -f ./pulsar/docker-compose.yml up -d", + "docker:pulsar:stop": "docker-compose -f ./pulsar/docker-compose.yml stop", "docker:build": "turbo run docker:build", "test": "turbo run test", "test:dev": "turbo run test:dev", @@ -61,4 +63,4 @@ "dependencies": { "@changesets/cli": "^2.26.0" } -} +} \ No newline at end of file diff --git a/pulsar/docker-compose.yml b/pulsar/docker-compose.yml new file mode 100644 index 000000000..b8c37727b --- /dev/null +++ b/pulsar/docker-compose.yml @@ -0,0 +1,19 @@ +version: "3.7" + +volumes: + pulsardatav: + driver: local + +services: + pulsar: + image: apachepulsar/pulsar:2.10.2 + ports: + - "6650:6650" + - "8080:8080" + volumes: + - "pulsardatav:/pulsar/data" + command: bin/pulsar standalone + container_name: pulsar + tty: true + stdin_open: true + restart: always