Merge pull request #27 from xmtp/fix-node-up

Fix node startup args

.env.local

@@ -0,0 +1,4 @@
+DB_CONNECTION_STRING="postgres://postgres:xmtp@localhost:25432/postgres?sslmode=disable"
+XMTP_GRPC_ADDRESS="localhost:5556"
+LOG_ENCODING=console
+API_PORT="8080"

README.md

@@ -48,8 +48,7 @@ The server can be run using the `./dev/run` script. Both the `worker` (which lis
 ```sh
 ## Only has to be run once
 ./dev/up
-source .env
-./dev/run --xmtp-listener --api
+./dev/start
 ```
 
 ### Command line options

dev/build

@@ -1,4 +1,5 @@
-#!/usr/bin/env sh
+#!/bin/bash
+set -eou pipefail
 
 GIT_COMMIT="$(git rev-parse HEAD)"
 XMTP_GO_CLIENT_VERSION="$(go list -json -m all | jq -r '. | select(.Path == "github.com/xmtp/proto") | .Version')"

dev/down

@@ -0,0 +1,4 @@
+#!/bin/bash
+set -eou pipefail
+
+docker compose down

dev/gen-proto

@@ -1,4 +1,5 @@
-#!/usr/bin/env bash
+#!/bin/bash
+set -eou pipefail
 
 set -e
 

dev/lint-shellcheck

@@ -1,5 +1,5 @@
-#!/usr/bin/env bash
-set -e
+#!/bin/bash
+set -eou pipefail
 
 read -ra shellcheck_paths <<< "$(grep -rIzl '^#!' dev)"
 shellcheck "${shellcheck_paths[@]}"

dev/push

@@ -1,5 +1,5 @@
-#!/usr/bin/env sh
-set -e
+#!/bin/bash
+set -eou pipefail
 
 DOCKER_IMAGE_TAG="${DOCKER_IMAGE_TAG:-dev}"
 DOCKER_IMAGE_NAME="${DOCKER_IMAGE_NAME:-xmtp/notifications-server}"

dev/run

@@ -1,3 +1,5 @@
-#!/usr/bin/env sh
+#!/bin/bash
+set -eou pipefail
+set -a; source .env.local; set +a
 
 go run ./cmd/server/main.go "$@"

dev/start

@@ -0,0 +1,4 @@
+#!/bin/bash
+set -eou pipefail
+
+dev/run --xmtp-listener --api "$@"

dev/up

@@ -1,3 +1,4 @@
-#!/usr/bin/env sh
+#!/bin/bash
+set -eou pipefail
 
 docker compose up -d

docker-compose.yml

@@ -1,15 +1,14 @@
 version: '3'
 
 services:
-  waku-node:
+  node:
     image: xmtp/node-go:latest
+    platform: linux/amd64
     command:
       - --ws
-      - --store
+      - --store.enable
       - --store.db-connection-string=postgres://postgres:xmtp@db:5432/postgres?sslmode=disable
       - --store.reader-db-connection-string=postgres://postgres:xmtp@db:5432/postgres?sslmode=disable
-      - --lightpush
-      - --filter
       - --ws-port=9001
       - --wait-for-db=30s
       - --api.authn.enable