From d5c768234b862010d3245d0b115e0828b226c493 Mon Sep 17 00:00:00 2001 From: valitovgaziz Date: Wed, 8 Oct 2025 02:25:56 +0500 Subject: [PATCH] new file: serv_nginx/api_bb/Dockerfile modified: serv_nginx/docker-compose.yml change docker compose yaml file, and add Dockerfile for api_bb --- serv_nginx/api_bb/Dockerfile | 23 +++++++++++++++++++++++ serv_nginx/docker-compose.yml | 30 +++++++++++++++--------------- 2 files changed, 38 insertions(+), 15 deletions(-) create mode 100644 serv_nginx/api_bb/Dockerfile diff --git a/serv_nginx/api_bb/Dockerfile b/serv_nginx/api_bb/Dockerfile new file mode 100644 index 0000000..1d08681 --- /dev/null +++ b/serv_nginx/api_bb/Dockerfile @@ -0,0 +1,23 @@ +# Используем официальный образ Go +FROM golang:1.25.1-alpine + +# Устанавливаем рабочую директорию +WORKDIR /app + +# Копируем go.mod и go.sum +COPY go.mod go.sum ./ + +# Скачиваем зависимости +RUN go mod download + +# Копируем исходный код +COPY . . + +# Собираем приложение +RUN go build -o main . + +# Экспонируем порт +EXPOSE 8080 + +# Запускаем приложение +CMD ["./main"] \ No newline at end of file diff --git a/serv_nginx/docker-compose.yml b/serv_nginx/docker-compose.yml index 945bd27..45b3f0b 100644 --- a/serv_nginx/docker-compose.yml +++ b/serv_nginx/docker-compose.yml @@ -38,9 +38,11 @@ services: - web-network - internal - app-network + - bb-network depends_on: - certbot - api + - api_bb api: build: @@ -81,14 +83,14 @@ services: - postgres_data:/var/lib/postgresql/data - ./migrations:/docker-entrypoint-initdb.d networks: - - bb-network + - app-network healthcheck: test: ["CMD-SHELL", "pg_isready -U postgres"] interval: 5s timeout: 10s retries: 5 - api_db: + api_bb: build: context: ./api_bb dockerfile: Dockerfile @@ -97,15 +99,15 @@ services: container_name: api_bb restart: unless-stopped depends_on: - db: + db_bb: condition: service_healthy environment: # Database connection settings - DB_HOST: db + DB_HOST: db_bb DB_PORT: 5432 DB_USER: postgres DB_PASSWORD: postgres - DB_NAME: mydb + DB_NAME: bb_db APP_PORT: 8080 networks: - bb-network @@ -115,30 +117,29 @@ services: timeout: 10s retries: 3 - bb_db: + db_bb: image: postgres:15-alpine ports: - - "5432:5432" + - "5433:5432" environment: POSTGRES_USER: postgres POSTGRES_PASSWORD: postgres - POSTGRES_DB: mydb + POSTGRES_DB: bb_db volumes: - bb_data:/var/lib/postgresql/data networks: - - bb_network + - bb-network healthcheck: test: ["CMD-SHELL", "pg_isready -U postgres"] interval: 5s timeout: 10s retries: 5 - volumes: certbot_data: certbot_www: postgres_data: - bb_data; + bb_data: networks: web-network: @@ -146,7 +147,6 @@ networks: internal: driver: bridge app-network: - name: serv_golang_rest_api_app-network - bb_network: - name: begushiy_bashkir_api_network - + driver: bridge + bb-network: + driver: bridge \ No newline at end of file