diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 0000000..a1d055b --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,20 @@ +{ + // Use IntelliSense to learn about possible attributes. + // Hover to view descriptions of existing attributes. + // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 + "version": "0.2.0", + "configurations": [ + { + "name": "Launch Relayer", + "type": "go", + "request": "launch", + "mode": "debug", + "asRoot": true, + "program": "${workspaceFolder}/examples/basic", + "cwd": "${workspaceFolder}/examples/basic", + "env": { + "POSTGRESQL_DATABASE" : "postgres://nostr:nostr@localhost:5432/nostr?sslmode=disable" + } + } + ] +} \ No newline at end of file diff --git a/examples/basic/Dockerfile b/examples/basic/Dockerfile index 47fea58..03c3f9b 100644 --- a/examples/basic/Dockerfile +++ b/examples/basic/Dockerfile @@ -1,8 +1,8 @@ -FROM golang:1.18 +FROM golang:1.21.1 WORKDIR /go/src/app COPY ./ . RUN go get -d -v ./... RUN go install -v ./... -RUN cd basic && make +RUN cd examples/basic && make diff --git a/examples/basic/docker-compose.yml b/examples/basic/docker-compose.yml index 918a509..4618663 100644 --- a/examples/basic/docker-compose.yml +++ b/examples/basic/docker-compose.yml @@ -3,17 +3,17 @@ services: relay: build: - context: ../ - dockerfile: ./basic/Dockerfile + context: ../../ + dockerfile: ./examples/basic/Dockerfile environment: - PORT: 2700 + PORT: 7447 POSTGRESQL_DATABASE: postgres://nostr:nostr@postgres:5432/nostr?sslmode=disable depends_on: postgres: condition: service_healthy ports: - - 2700:2700 - command: "./basic/relayer-basic" + - 2700:7447 + command: "./examples/basic/relayer-basic" postgres: image: postgres @@ -30,3 +30,19 @@ services: interval: 10s timeout: 5s retries: 5 + + pgadmin: + container_name: pgadmin + image: dpage/pgadmin4 + restart: unless-stopped + depends_on: + - postgres + ports: + - "5050:80" + environment: + PGADMIN_DEFAULT_EMAIL: nostr@nostr.nostr + PGADMIN_DEFAULT_PASSWORD: nostr + volumes: + - pgadmin:/var/lib/pgadmin +volumes: + pgadmin: \ No newline at end of file