From c73701cf5c51782b6f5188d07f78b84a0860be4e Mon Sep 17 00:00:00 2001 From: valitovgaziz Date: Sun, 5 Oct 2025 23:27:19 +0500 Subject: [PATCH] merge services api and nginx --- serv_nginx/docker-compose.yml | 52 +++++++++++++++++- .../serv_golang_rest_api/.env | 0 .../serv_golang_rest_api/Dockerfile | 0 .../serv_golang_rest_api/cmd/api/main.go | 0 .../serv_golang_rest_api/docker-compose.yaml | 2 +- .../serv_golang_rest_api/go.mod | 0 .../serv_golang_rest_api/go.sum | 0 .../internal/config/config.go | 0 .../internal/config/oauth.go | 0 .../internal/handlers/auth.go | 0 .../internal/handlers/middleware.go | 0 .../internal/handlers/oauth.go | 0 .../internal/handlers/oauth_VK.go | 0 .../internal/handlers/oauth_yandex.go | 0 .../internal/handlers/user_handler.go | 0 .../internal/middleware/auth.go | 0 .../internal/models/o_auth_provider.go | 0 .../internal/models/user.go | 0 .../internal/repository/user_repository.go | 0 .../internal/server/server.go | 0 .../internal/service/user_service.go | 0 .../internal/utils/errors.go | 0 .../internal/utils/json.go | 0 .../internal/utils/jwt.go | 0 .../internal/utils/oauth_utils.go | 0 .../internal/utils/password.go | 0 .../serv_golang_rest_api/main | Bin .../migrations/001_create_users.sql | 0 .../pkg/database/postgres.go | 0 29 files changed, 50 insertions(+), 4 deletions(-) rename {yalarba => serv_nginx}/serv_golang_rest_api/.env (100%) rename {yalarba => serv_nginx}/serv_golang_rest_api/Dockerfile (100%) rename {yalarba => serv_nginx}/serv_golang_rest_api/cmd/api/main.go (100%) rename {yalarba => serv_nginx}/serv_golang_rest_api/docker-compose.yaml (96%) rename {yalarba => serv_nginx}/serv_golang_rest_api/go.mod (100%) rename {yalarba => serv_nginx}/serv_golang_rest_api/go.sum (100%) rename {yalarba => serv_nginx}/serv_golang_rest_api/internal/config/config.go (100%) rename {yalarba => serv_nginx}/serv_golang_rest_api/internal/config/oauth.go (100%) rename {yalarba => serv_nginx}/serv_golang_rest_api/internal/handlers/auth.go (100%) rename {yalarba => serv_nginx}/serv_golang_rest_api/internal/handlers/middleware.go (100%) rename {yalarba => serv_nginx}/serv_golang_rest_api/internal/handlers/oauth.go (100%) rename {yalarba => serv_nginx}/serv_golang_rest_api/internal/handlers/oauth_VK.go (100%) rename {yalarba => serv_nginx}/serv_golang_rest_api/internal/handlers/oauth_yandex.go (100%) rename {yalarba => serv_nginx}/serv_golang_rest_api/internal/handlers/user_handler.go (100%) rename {yalarba => serv_nginx}/serv_golang_rest_api/internal/middleware/auth.go (100%) rename {yalarba => serv_nginx}/serv_golang_rest_api/internal/models/o_auth_provider.go (100%) rename {yalarba => serv_nginx}/serv_golang_rest_api/internal/models/user.go (100%) rename {yalarba => serv_nginx}/serv_golang_rest_api/internal/repository/user_repository.go (100%) rename {yalarba => serv_nginx}/serv_golang_rest_api/internal/server/server.go (100%) rename {yalarba => serv_nginx}/serv_golang_rest_api/internal/service/user_service.go (100%) rename {yalarba => serv_nginx}/serv_golang_rest_api/internal/utils/errors.go (100%) rename {yalarba => serv_nginx}/serv_golang_rest_api/internal/utils/json.go (100%) rename {yalarba => serv_nginx}/serv_golang_rest_api/internal/utils/jwt.go (100%) rename {yalarba => serv_nginx}/serv_golang_rest_api/internal/utils/oauth_utils.go (100%) rename {yalarba => serv_nginx}/serv_golang_rest_api/internal/utils/password.go (100%) rename {yalarba => serv_nginx}/serv_golang_rest_api/main (100%) rename {yalarba => serv_nginx}/serv_golang_rest_api/migrations/001_create_users.sql (100%) rename {yalarba => serv_nginx}/serv_golang_rest_api/pkg/database/postgres.go (100%) diff --git a/serv_nginx/docker-compose.yml b/serv_nginx/docker-compose.yml index 612baea..77b4725 100644 --- a/serv_nginx/docker-compose.yml +++ b/serv_nginx/docker-compose.yml @@ -37,18 +37,64 @@ services: networks: - web-network - internal - - serv_golang_rest_api_app-network # ัะตั‚ัŒ API + - app-network depends_on: - certbot + api: + build: + context: ./serv_golang_rest_api + dockerfile: Dockerfile + ports: + - "8888:8080" + container_name: serv_golang_rest_api + restart: unless-stopped + depends_on: + db: + condition: service_healthy + environment: + # Database connection settings + DB_HOST: db + DB_PORT: 5432 + DB_USER: postgres + DB_PASSWORD: postgres + DB_NAME: mydb + APP_PORT: 8080 + networks: + - app-network + healthcheck: + test: ["CMD", "wget", "--no-verbose", "--tries=1", "--spider", "http://localhost:8080/health"] + interval: 30s + timeout: 10s + retries: 3 + + db: + image: postgres:15-alpine + ports: + - "5432:5432" + environment: + POSTGRES_USER: postgres + POSTGRES_PASSWORD: postgres + POSTGRES_DB: mydb + volumes: + - postgres_data:/var/lib/postgresql/data + - ./migrations:/docker-entrypoint-initdb.d + networks: + - app-network + healthcheck: + test: ["CMD-SHELL", "pg_isready -U postgres"] + interval: 5s + timeout: 10s + retries: 5 + volumes: certbot_data: certbot_www: + postgres_data: networks: web-network: driver: bridge internal: - serv_golang_rest_api_app-network: - external: true + app-network: name: serv_golang_rest_api_app-network diff --git a/yalarba/serv_golang_rest_api/.env b/serv_nginx/serv_golang_rest_api/.env similarity index 100% rename from yalarba/serv_golang_rest_api/.env rename to serv_nginx/serv_golang_rest_api/.env diff --git a/yalarba/serv_golang_rest_api/Dockerfile b/serv_nginx/serv_golang_rest_api/Dockerfile similarity index 100% rename from yalarba/serv_golang_rest_api/Dockerfile rename to serv_nginx/serv_golang_rest_api/Dockerfile diff --git a/yalarba/serv_golang_rest_api/cmd/api/main.go b/serv_nginx/serv_golang_rest_api/cmd/api/main.go similarity index 100% rename from yalarba/serv_golang_rest_api/cmd/api/main.go rename to serv_nginx/serv_golang_rest_api/cmd/api/main.go diff --git a/yalarba/serv_golang_rest_api/docker-compose.yaml b/serv_nginx/serv_golang_rest_api/docker-compose.yaml similarity index 96% rename from yalarba/serv_golang_rest_api/docker-compose.yaml rename to serv_nginx/serv_golang_rest_api/docker-compose.yaml index d12df4d..12afb79 100644 --- a/yalarba/serv_golang_rest_api/docker-compose.yaml +++ b/serv_nginx/serv_golang_rest_api/docker-compose.yaml @@ -1,7 +1,7 @@ services: api: build: - context: . + context: ./serv_golang_rest_api dockerfile: Dockerfile ports: - "8888:8080" diff --git a/yalarba/serv_golang_rest_api/go.mod b/serv_nginx/serv_golang_rest_api/go.mod similarity index 100% rename from yalarba/serv_golang_rest_api/go.mod rename to serv_nginx/serv_golang_rest_api/go.mod diff --git a/yalarba/serv_golang_rest_api/go.sum b/serv_nginx/serv_golang_rest_api/go.sum similarity index 100% rename from yalarba/serv_golang_rest_api/go.sum rename to serv_nginx/serv_golang_rest_api/go.sum diff --git a/yalarba/serv_golang_rest_api/internal/config/config.go b/serv_nginx/serv_golang_rest_api/internal/config/config.go similarity index 100% rename from yalarba/serv_golang_rest_api/internal/config/config.go rename to serv_nginx/serv_golang_rest_api/internal/config/config.go diff --git a/yalarba/serv_golang_rest_api/internal/config/oauth.go b/serv_nginx/serv_golang_rest_api/internal/config/oauth.go similarity index 100% rename from yalarba/serv_golang_rest_api/internal/config/oauth.go rename to serv_nginx/serv_golang_rest_api/internal/config/oauth.go diff --git a/yalarba/serv_golang_rest_api/internal/handlers/auth.go b/serv_nginx/serv_golang_rest_api/internal/handlers/auth.go similarity index 100% rename from yalarba/serv_golang_rest_api/internal/handlers/auth.go rename to serv_nginx/serv_golang_rest_api/internal/handlers/auth.go diff --git a/yalarba/serv_golang_rest_api/internal/handlers/middleware.go b/serv_nginx/serv_golang_rest_api/internal/handlers/middleware.go similarity index 100% rename from yalarba/serv_golang_rest_api/internal/handlers/middleware.go rename to serv_nginx/serv_golang_rest_api/internal/handlers/middleware.go diff --git a/yalarba/serv_golang_rest_api/internal/handlers/oauth.go b/serv_nginx/serv_golang_rest_api/internal/handlers/oauth.go similarity index 100% rename from yalarba/serv_golang_rest_api/internal/handlers/oauth.go rename to serv_nginx/serv_golang_rest_api/internal/handlers/oauth.go diff --git a/yalarba/serv_golang_rest_api/internal/handlers/oauth_VK.go b/serv_nginx/serv_golang_rest_api/internal/handlers/oauth_VK.go similarity index 100% rename from yalarba/serv_golang_rest_api/internal/handlers/oauth_VK.go rename to serv_nginx/serv_golang_rest_api/internal/handlers/oauth_VK.go diff --git a/yalarba/serv_golang_rest_api/internal/handlers/oauth_yandex.go b/serv_nginx/serv_golang_rest_api/internal/handlers/oauth_yandex.go similarity index 100% rename from yalarba/serv_golang_rest_api/internal/handlers/oauth_yandex.go rename to serv_nginx/serv_golang_rest_api/internal/handlers/oauth_yandex.go diff --git a/yalarba/serv_golang_rest_api/internal/handlers/user_handler.go b/serv_nginx/serv_golang_rest_api/internal/handlers/user_handler.go similarity index 100% rename from yalarba/serv_golang_rest_api/internal/handlers/user_handler.go rename to serv_nginx/serv_golang_rest_api/internal/handlers/user_handler.go diff --git a/yalarba/serv_golang_rest_api/internal/middleware/auth.go b/serv_nginx/serv_golang_rest_api/internal/middleware/auth.go similarity index 100% rename from yalarba/serv_golang_rest_api/internal/middleware/auth.go rename to serv_nginx/serv_golang_rest_api/internal/middleware/auth.go diff --git a/yalarba/serv_golang_rest_api/internal/models/o_auth_provider.go b/serv_nginx/serv_golang_rest_api/internal/models/o_auth_provider.go similarity index 100% rename from yalarba/serv_golang_rest_api/internal/models/o_auth_provider.go rename to serv_nginx/serv_golang_rest_api/internal/models/o_auth_provider.go diff --git a/yalarba/serv_golang_rest_api/internal/models/user.go b/serv_nginx/serv_golang_rest_api/internal/models/user.go similarity index 100% rename from yalarba/serv_golang_rest_api/internal/models/user.go rename to serv_nginx/serv_golang_rest_api/internal/models/user.go diff --git a/yalarba/serv_golang_rest_api/internal/repository/user_repository.go b/serv_nginx/serv_golang_rest_api/internal/repository/user_repository.go similarity index 100% rename from yalarba/serv_golang_rest_api/internal/repository/user_repository.go rename to serv_nginx/serv_golang_rest_api/internal/repository/user_repository.go diff --git a/yalarba/serv_golang_rest_api/internal/server/server.go b/serv_nginx/serv_golang_rest_api/internal/server/server.go similarity index 100% rename from yalarba/serv_golang_rest_api/internal/server/server.go rename to serv_nginx/serv_golang_rest_api/internal/server/server.go diff --git a/yalarba/serv_golang_rest_api/internal/service/user_service.go b/serv_nginx/serv_golang_rest_api/internal/service/user_service.go similarity index 100% rename from yalarba/serv_golang_rest_api/internal/service/user_service.go rename to serv_nginx/serv_golang_rest_api/internal/service/user_service.go diff --git a/yalarba/serv_golang_rest_api/internal/utils/errors.go b/serv_nginx/serv_golang_rest_api/internal/utils/errors.go similarity index 100% rename from yalarba/serv_golang_rest_api/internal/utils/errors.go rename to serv_nginx/serv_golang_rest_api/internal/utils/errors.go diff --git a/yalarba/serv_golang_rest_api/internal/utils/json.go b/serv_nginx/serv_golang_rest_api/internal/utils/json.go similarity index 100% rename from yalarba/serv_golang_rest_api/internal/utils/json.go rename to serv_nginx/serv_golang_rest_api/internal/utils/json.go diff --git a/yalarba/serv_golang_rest_api/internal/utils/jwt.go b/serv_nginx/serv_golang_rest_api/internal/utils/jwt.go similarity index 100% rename from yalarba/serv_golang_rest_api/internal/utils/jwt.go rename to serv_nginx/serv_golang_rest_api/internal/utils/jwt.go diff --git a/yalarba/serv_golang_rest_api/internal/utils/oauth_utils.go b/serv_nginx/serv_golang_rest_api/internal/utils/oauth_utils.go similarity index 100% rename from yalarba/serv_golang_rest_api/internal/utils/oauth_utils.go rename to serv_nginx/serv_golang_rest_api/internal/utils/oauth_utils.go diff --git a/yalarba/serv_golang_rest_api/internal/utils/password.go b/serv_nginx/serv_golang_rest_api/internal/utils/password.go similarity index 100% rename from yalarba/serv_golang_rest_api/internal/utils/password.go rename to serv_nginx/serv_golang_rest_api/internal/utils/password.go diff --git a/yalarba/serv_golang_rest_api/main b/serv_nginx/serv_golang_rest_api/main similarity index 100% rename from yalarba/serv_golang_rest_api/main rename to serv_nginx/serv_golang_rest_api/main diff --git a/yalarba/serv_golang_rest_api/migrations/001_create_users.sql b/serv_nginx/serv_golang_rest_api/migrations/001_create_users.sql similarity index 100% rename from yalarba/serv_golang_rest_api/migrations/001_create_users.sql rename to serv_nginx/serv_golang_rest_api/migrations/001_create_users.sql diff --git a/yalarba/serv_golang_rest_api/pkg/database/postgres.go b/serv_nginx/serv_golang_rest_api/pkg/database/postgres.go similarity index 100% rename from yalarba/serv_golang_rest_api/pkg/database/postgres.go rename to serv_nginx/serv_golang_rest_api/pkg/database/postgres.go