From f441d7379817314c5a472bf48cf89cd8ebd99920 Mon Sep 17 00:00:00 2001 From: "Jason C. Leach" Date: Wed, 15 Jan 2025 13:17:50 -0800 Subject: [PATCH 1/8] feat: add dev container Signed-off-by: Jason C. Leach --- .devcontainer/devcontainer.json | 25 +++++++++++++ .devcontainer/docker-compose.yml | 64 ++++++++++++++++++++++++++++++++ .env.example | 21 +++++++---- 3 files changed, 103 insertions(+), 7 deletions(-) create mode 100644 .devcontainer/devcontainer.json create mode 100644 .devcontainer/docker-compose.yml diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json new file mode 100644 index 0000000..83e448c --- /dev/null +++ b/.devcontainer/devcontainer.json @@ -0,0 +1,25 @@ +{ + "name": "Node.js", + "dockerComposeFile": [ + "docker-compose.yml" + ], + "service": "mediator", + "remoteUser": "node", + "workspaceFolder": "/work", + "containerEnv": { + "COREPACK_ENABLE_STRICT": "1" + }, + "postCreateCommand": "sudo chown node node_modules && sudo sudo corepack enable && yes | corepack prepare pnpm --activate && yes | pnpm install --frozen-lockfile", + "features": { + "ghcr.io/jckimble/devcontainer-features/ngrok:3": {} + }, + "customizations": { + "vscode": { + "extensions": [ + "github.copilot", + "github.copilot-chat", + "ms-azuretools.vscode-docker" + ] + } + } +} \ No newline at end of file diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml new file mode 100644 index 0000000..911cbfa --- /dev/null +++ b/.devcontainer/docker-compose.yml @@ -0,0 +1,64 @@ +version: '3.9' + +networks: + local_network: + name: local_network +volumes: + postgres-data: + +services: + # redis-1: + # image: redis:7.2.3-alpine + # command: redis-server --appendonly yes --cluster-enabled yes --cluster-config-file nodes.conf --cluster-node-timeout 5000 --port 6379 + # environment: + # - 'IP=0.0.0.0' + # networks: + # - local_network + # ports: + # - '6379:6379' + + # redis-2: + # image: redis:7.2.3-alpine + # command: redis-server --appendonly yes --cluster-enabled yes --cluster-config-file nodes.conf --cluster-node-timeout 5000 --port 6379 + # environment: + # - 'IP=0.0.0.0' + # networks: + # - local_network + # ports: + # - '6380:6379' + + # redis-3: + # image: redis:7.2.3-alpine + # command: redis-server --appendonly yes --cluster-enabled yes --cluster-config-file nodes.conf --cluster-node-timeout 5000 --port 6379 + # environment: + # - 'IP=0.0.0.0' + # networks: + # - local_network + # ports: + # - '6381:6379' + + postgres: + image: postgres:13 + env_file: + - ../.env + volumes: + - postgres-data:/var/lib/postgresql/data + networks: + - local_network + + mediator: + image: mcr.microsoft.com/devcontainers/javascript-node:1-20-bullseye + working_dir: /work + volumes: + - ../:/work + - /work/node_modules + ports: + - '3110:3110' + tty: true + networks: + - local_network + env_file: + - ../.env + environment: + # - REDIS_URI=redis://redis-1:6379/0 + - POSTGRES_HOST=postgres diff --git a/.env.example b/.env.example index b2196f7..591735f 100644 --- a/.env.example +++ b/.env.example @@ -1,8 +1,15 @@ -POSTGRES_USER= -POSTGRES_PASSWORD= -POSTGRES_HOST= -POSTGRES_ADMIN_USER= -POSTGRES_ADMIN_PASSWORD= +# Agent +AGENT_ENDPOINTS='https://example.ca,wss://example.ca' +USE_PUSH_NOTIFICATIONS='false' +NOTIFICATION_WEBHOOK_URL= + +# Database +POSTGRES_USER=postgres +POSTGRES_PASSWORD=85a52c9283b0 +POSTGRES_ADMIN_USER=postgres +POSTGRES_ADMIN_PASSWORD=85a52c9283b0 + +# Wallet +WALLET_KEY=a67d8724cb01c7c0b5d92f01fb052885 +WALLET_NAME=mediator-dev # Will be database name. -USE_PUSH_NOTIFICATIONS='true' -NOTIFICATION_WEBHOOK_URL= \ No newline at end of file From 7d59d4d2bf0ffdb3c179bde5cab0d594e48be05e Mon Sep 17 00:00:00 2001 From: "Jason C. Leach" Date: Mon, 20 Jan 2025 12:48:29 -0800 Subject: [PATCH 2/8] fix: ignore merge artifacts Signed-off-by: Jason C. Leach --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index e4aac6a..cfafea5 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,5 @@ build node_modules .env .env.local -.pnpm-store/ \ No newline at end of file +.pnpm-store/ +*.orig From fe5cf6db6fdd42a3aa2e5db41fa0fbdd09e4efb9 Mon Sep 17 00:00:00 2001 From: "Jason C. Leach" Date: Mon, 20 Jan 2025 12:52:51 -0800 Subject: [PATCH 3/8] chore: cleanup Signed-off-by: Jason C. Leach --- .devcontainer/docker-compose.yml | 32 +------------------------------- 1 file changed, 1 insertion(+), 31 deletions(-) diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml index 911cbfa..f50f6ed 100644 --- a/.devcontainer/docker-compose.yml +++ b/.devcontainer/docker-compose.yml @@ -6,37 +6,8 @@ networks: volumes: postgres-data: -services: - # redis-1: - # image: redis:7.2.3-alpine - # command: redis-server --appendonly yes --cluster-enabled yes --cluster-config-file nodes.conf --cluster-node-timeout 5000 --port 6379 - # environment: - # - 'IP=0.0.0.0' - # networks: - # - local_network - # ports: - # - '6379:6379' - - # redis-2: - # image: redis:7.2.3-alpine - # command: redis-server --appendonly yes --cluster-enabled yes --cluster-config-file nodes.conf --cluster-node-timeout 5000 --port 6379 - # environment: - # - 'IP=0.0.0.0' - # networks: - # - local_network - # ports: - # - '6380:6379' - - # redis-3: - # image: redis:7.2.3-alpine - # command: redis-server --appendonly yes --cluster-enabled yes --cluster-config-file nodes.conf --cluster-node-timeout 5000 --port 6379 - # environment: - # - 'IP=0.0.0.0' - # networks: - # - local_network - # ports: - # - '6381:6379' +services: postgres: image: postgres:13 env_file: @@ -60,5 +31,4 @@ services: env_file: - ../.env environment: - # - REDIS_URI=redis://redis-1:6379/0 - POSTGRES_HOST=postgres From 230c1dde6fd5605759e031cb6f508dc44a1b47a1 Mon Sep 17 00:00:00 2001 From: "Jason C. Leach" Date: Mon, 20 Jan 2025 12:55:24 -0800 Subject: [PATCH 4/8] chore: biome cleanup Signed-off-by: Jason C. Leach --- .devcontainer/devcontainer.json | 42 ++++++++++++++------------------- 1 file changed, 18 insertions(+), 24 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 83e448c..81181e9 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,25 +1,19 @@ { - "name": "Node.js", - "dockerComposeFile": [ - "docker-compose.yml" - ], - "service": "mediator", - "remoteUser": "node", - "workspaceFolder": "/work", - "containerEnv": { - "COREPACK_ENABLE_STRICT": "1" - }, - "postCreateCommand": "sudo chown node node_modules && sudo sudo corepack enable && yes | corepack prepare pnpm --activate && yes | pnpm install --frozen-lockfile", - "features": { - "ghcr.io/jckimble/devcontainer-features/ngrok:3": {} - }, - "customizations": { - "vscode": { - "extensions": [ - "github.copilot", - "github.copilot-chat", - "ms-azuretools.vscode-docker" - ] - } - } -} \ No newline at end of file + "name": "Node.js", + "dockerComposeFile": ["docker-compose.yml"], + "service": "mediator", + "remoteUser": "node", + "workspaceFolder": "/work", + "containerEnv": { + "COREPACK_ENABLE_STRICT": "1" + }, + "postCreateCommand": "sudo chown node node_modules && sudo sudo corepack enable && yes | corepack prepare pnpm --activate && yes | pnpm install --frozen-lockfile", + "features": { + "ghcr.io/jckimble/devcontainer-features/ngrok:3": {} + }, + "customizations": { + "vscode": { + "extensions": ["github.copilot", "github.copilot-chat", "ms-azuretools.vscode-docker"] + } + } +} From cd199d9842941586312f977fd45ce344b426dd14 Mon Sep 17 00:00:00 2001 From: "Jason C. Leach" Date: Wed, 22 Jan 2025 06:51:15 -0800 Subject: [PATCH 5/8] Update .devcontainer/docker-compose.yml Co-authored-by: Timo Glastra Signed-off-by: Jason C. Leach --- .devcontainer/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml index f50f6ed..4f3d5c8 100644 --- a/.devcontainer/docker-compose.yml +++ b/.devcontainer/docker-compose.yml @@ -1,7 +1,7 @@ version: '3.9' networks: - local_network: + local_credo_mediator_network: name: local_network volumes: postgres-data: From a94d348214df65439b6c4fc18cc408b05d723d83 Mon Sep 17 00:00:00 2001 From: "Jason C. Leach" Date: Wed, 22 Jan 2025 06:54:07 -0800 Subject: [PATCH 6/8] chore: fix vscode plugins Signed-off-by: Jason C. Leach --- .devcontainer/devcontainer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 81181e9..c8d09bd 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -13,7 +13,7 @@ }, "customizations": { "vscode": { - "extensions": ["github.copilot", "github.copilot-chat", "ms-azuretools.vscode-docker"] + "extensions": ["ms-azuretools.vscode-docker"] } } } From 04736f6415118cb68e0c6d4c075717f79f4b8e61 Mon Sep 17 00:00:00 2001 From: "Jason C. Leach" Date: Wed, 22 Jan 2025 07:00:19 -0800 Subject: [PATCH 7/8] chore: cleanup Signed-off-by: Jason C. Leach --- .devcontainer/devcontainer.json | 10 +++++++--- .devcontainer/docker-compose.yml | 10 +++++----- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index c8d09bd..a280d65 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,6 +1,8 @@ { "name": "Node.js", - "dockerComposeFile": ["docker-compose.yml"], + "dockerComposeFile": [ + "docker-compose.yml" + ], "service": "mediator", "remoteUser": "node", "workspaceFolder": "/work", @@ -13,7 +15,9 @@ }, "customizations": { "vscode": { - "extensions": ["ms-azuretools.vscode-docker"] + "extensions": [ + "ms-azuretools.vscode-docker" + ] } } -} +} \ No newline at end of file diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml index 4f3d5c8..64d15df 100644 --- a/.devcontainer/docker-compose.yml +++ b/.devcontainer/docker-compose.yml @@ -1,8 +1,8 @@ -version: '3.9' +version: "3.9" networks: local_credo_mediator_network: - name: local_network + name: local_credo_mediator_network volumes: postgres-data: @@ -15,7 +15,7 @@ services: volumes: - postgres-data:/var/lib/postgresql/data networks: - - local_network + - local_credo_mediator_network mediator: image: mcr.microsoft.com/devcontainers/javascript-node:1-20-bullseye @@ -24,10 +24,10 @@ services: - ../:/work - /work/node_modules ports: - - '3110:3110' + - "3110:3110" tty: true networks: - - local_network + - local_credo_mediator_network env_file: - ../.env environment: From e2aaf5d8ec123ce6d4dc93fa6e5b45d6cfba3beb Mon Sep 17 00:00:00 2001 From: "Jason C. Leach" Date: Wed, 22 Jan 2025 07:00:38 -0800 Subject: [PATCH 8/8] chore: cleanup Signed-off-by: Jason C. Leach --- .devcontainer/devcontainer.json | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index a280d65..c8d09bd 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,8 +1,6 @@ { "name": "Node.js", - "dockerComposeFile": [ - "docker-compose.yml" - ], + "dockerComposeFile": ["docker-compose.yml"], "service": "mediator", "remoteUser": "node", "workspaceFolder": "/work", @@ -15,9 +13,7 @@ }, "customizations": { "vscode": { - "extensions": [ - "ms-azuretools.vscode-docker" - ] + "extensions": ["ms-azuretools.vscode-docker"] } } -} \ No newline at end of file +}