From a61455a53858dde8487d7a1028b26d5884d73321 Mon Sep 17 00:00:00 2001 From: Fedorov Vladimir Date: Wed, 17 Jun 2026 00:08:47 +0700 Subject: [PATCH] updates --- .env.example | 1 + .gitignore | 2 ++ README.md | 2 +- docker-compose-db.yml | 18 ++++++++++++++++++ docker-compose.yml | 4 ++-- go.mod | 10 ++++++++-- 6 files changed, 32 insertions(+), 5 deletions(-) create mode 100644 .env.example create mode 100644 docker-compose-db.yml diff --git a/.env.example b/.env.example new file mode 100644 index 0000000..509157a --- /dev/null +++ b/.env.example @@ -0,0 +1 @@ +DATABASE_URL=postgresql://postgres:postgres@localhost:5432/${REPO_NAME_SNAKE}?sslmode=disable diff --git a/.gitignore b/.gitignore index b6fbbf2..532819e 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,5 @@ go.work .idea go.sum + +.env diff --git a/README.md b/README.md index 50626b6..0bc0b99 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ Шалон для Go сервисов (имя репо должно быть snake case) -Init +Инициализация ```shell make generate diff --git a/docker-compose-db.yml b/docker-compose-db.yml new file mode 100644 index 0000000..2105514 --- /dev/null +++ b/docker-compose-db.yml @@ -0,0 +1,18 @@ +version: '3.8' + +services: + postgres: + image: postgres:15 + container_name: postgres15 + environment: + POSTGRES_USER: postgres + POSTGRES_PASSWORD: postgres + POSTGRES_DB: ${REPO_NAME_SNAKE} + ports: + - "5432:5432" + volumes: + - postgres_data:/var/lib/postgresql/data + restart: unless-stopped + +volumes: + postgres_data: diff --git a/docker-compose.yml b/docker-compose.yml index e3e967f..0b57f1f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -20,8 +20,8 @@ services: - app_network postgres: - image: postgres:18 - container_name: postgres18 + image: postgres:15 + container_name: postgres15 environment: POSTGRES_USER: postgres POSTGRES_PASSWORD: postgres diff --git a/go.mod b/go.mod index 8f428aa..29576c8 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module ${REPO_NAME_SNAKE} -go 1.22 +go 1.25.0 require ( github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 @@ -10,8 +10,14 @@ require ( ) require ( + github.com/jackc/pgpassfile v1.0.0 // indirect + github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect + github.com/jackc/pgx/v5 v5.10.0 // indirect + github.com/jackc/puddle/v2 v2.2.2 // indirect + github.com/joho/godotenv v1.5.1 golang.org/x/net v0.23.0 // indirect + golang.org/x/sync v0.17.0 // indirect golang.org/x/sys v0.18.0 // indirect - golang.org/x/text v0.15.0 // indirect + golang.org/x/text v0.29.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240513163218-0867130af1f8 // indirect )