From 9af65d8a8908d9a48f1cb8104bca175b623c197d Mon Sep 17 00:00:00 2001 From: Fedorov Vladimir Date: Mon, 6 Jul 2026 23:58:32 +0700 Subject: [PATCH] fix docker --- Makefile | 4 ++-- docker-compose-db.yml | 4 ++-- docker-compose.yml | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 552464c..e1a438f 100644 --- a/Makefile +++ b/Makefile @@ -17,10 +17,10 @@ build-builder: build-linux: docker run --rm \ - -v "$PWD":/app \ + -v "$$PWD":/app \ -w /app \ my-go-builder sh -c \ - "GOOS=linux GOARCH=arm64 go build -o bin/evening_detective_server_linux_arm64 cmd/evening_detective_server/main.go" + "GOOS=linux GOARCH=arm64 go build -o bin/evening_detective_server cmd/evening_detective_server/main.go" test: go test -count=1 ./... diff --git a/docker-compose-db.yml b/docker-compose-db.yml index 3dd23ed..32d973d 100644 --- a/docker-compose-db.yml +++ b/docker-compose-db.yml @@ -8,8 +8,8 @@ services: POSTGRES_USER: postgres POSTGRES_PASSWORD: postgres POSTGRES_DB: evening_detective_server - TZ: Asia/Barnaul # Для системного времени контейнера - PGTZ: Asia/Barnaul # Специфичная для PostgreSQL переменная + TZ: Asia/Barnaul # Для системного времени контейнера + PGTZ: Asia/Barnaul # Специфичная для PostgreSQL переменная ports: - "5432:5432" volumes: diff --git a/docker-compose.yml b/docker-compose.yml index d245bc9..023d904 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -12,7 +12,7 @@ services: ports: - "8080:8080" environment: - - DATABASE_URL: "postgresql://postgres:postgres@postgres:5432/evening_detective_server?sslmode=disable" + DATABASE_URL: "postgresql://postgres:postgres@postgres:5432/evening_detective_server?sslmode=disable" depends_on: - postgres restart: unless-stopped @@ -26,8 +26,8 @@ services: POSTGRES_USER: postgres POSTGRES_PASSWORD: detective POSTGRES_DB: evening_detective_server - TZ: Asia/Barnaul # Для системного времени контейнера - PGTZ: Asia/Barnaul # Специфичная для PostgreSQL переменная + TZ: Asia/Barnaul # Для системного времени контейнера + PGTZ: Asia/Barnaul # Специфичная для PostgreSQL переменная ports: - "5432:5432" volumes: