фиксы запуска
This commit is contained in:
@@ -8,8 +8,7 @@ RUN uv sync --frozen
|
|||||||
|
|
||||||
COPY src ./src
|
COPY src ./src
|
||||||
COPY shared ./shared
|
COPY shared ./shared
|
||||||
COPY alembic.ini ./
|
COPY migrations ./migrations
|
||||||
COPY migration ./migration
|
|
||||||
|
|
||||||
ENV PYTHONPATH=/shared:/src
|
ENV PYTHONPATH=/shared:/src
|
||||||
ARG GIT_COMMIT=unknown
|
ARG GIT_COMMIT=unknown
|
||||||
|
|||||||
@@ -1,21 +1,46 @@
|
|||||||
services:
|
services:
|
||||||
# backend:
|
|
||||||
# build:
|
|
||||||
# context: .
|
|
||||||
# args:
|
|
||||||
# GIT_COMMIT: ${GIT_COMMIT:-unknown}
|
|
||||||
# env_file:
|
|
||||||
# - .env
|
|
||||||
# ports:
|
|
||||||
# - "8000:8000"
|
|
||||||
# depends_on:
|
|
||||||
# - postgres
|
|
||||||
|
|
||||||
postgres:
|
postgres:
|
||||||
image: postgres
|
image: postgres:15
|
||||||
environment:
|
environment:
|
||||||
POSTGRES_USER: "user"
|
POSTGRES_USER: "user"
|
||||||
POSTGRES_PASSWORD: "password"
|
POSTGRES_PASSWORD: "password"
|
||||||
POSTGRES_DB: "tgex"
|
POSTGRES_DB: "tgex"
|
||||||
ports:
|
ports:
|
||||||
- "5432:5432"
|
- "5432:5432"
|
||||||
|
volumes:
|
||||||
|
- postgres_data:/var/lib/postgresql/data
|
||||||
|
healthcheck:
|
||||||
|
test: ["CMD-SHELL", "pg_isready -U user -d tgex"]
|
||||||
|
interval: 10s
|
||||||
|
timeout: 5s
|
||||||
|
retries: 5
|
||||||
|
|
||||||
|
backend:
|
||||||
|
build:
|
||||||
|
context: .
|
||||||
|
ports:
|
||||||
|
- "8000:8000"
|
||||||
|
environment:
|
||||||
|
- DB__HOST=postgres
|
||||||
|
- DB__PORT=5432
|
||||||
|
- DB__USER=user
|
||||||
|
- DB__PASSWORD=password
|
||||||
|
- DB__DATABASE=tgex
|
||||||
|
depends_on:
|
||||||
|
postgres:
|
||||||
|
condition: service_healthy
|
||||||
|
env_file:
|
||||||
|
- .env
|
||||||
|
restart: unless-stopped
|
||||||
|
|
||||||
|
tg_bot:
|
||||||
|
build:
|
||||||
|
context: telegram_bot
|
||||||
|
depends_on:
|
||||||
|
- backend
|
||||||
|
env_file:
|
||||||
|
- .env
|
||||||
|
restart: unless-stopped
|
||||||
|
|
||||||
|
volumes:
|
||||||
|
postgres_data:
|
||||||
|
|||||||
17
telegram_bot/Dockerfile
Normal file
17
telegram_bot/Dockerfile
Normal file
@@ -0,0 +1,17 @@
|
|||||||
|
FROM golang:1.25-alpine AS build
|
||||||
|
|
||||||
|
WORKDIR /app
|
||||||
|
|
||||||
|
# Modules layer
|
||||||
|
COPY go.mod go.sum ./
|
||||||
|
RUN go mod download
|
||||||
|
|
||||||
|
# Build layer
|
||||||
|
COPY . .
|
||||||
|
RUN CGO_ENABLED=0 GOOS=linux go build -o /tg_bot .
|
||||||
|
|
||||||
|
FROM alpine:latest AS run
|
||||||
|
|
||||||
|
COPY --from=build /tg_bot /tg_bot
|
||||||
|
|
||||||
|
CMD ["/tg_bot"]
|
||||||
@@ -26,7 +26,7 @@ func main() {
|
|||||||
|
|
||||||
// Инициализация backend client
|
// Инициализация backend client
|
||||||
backendClient := backend.New(backend.Config{
|
backendClient := backend.New(backend.Config{
|
||||||
BaseURL: "http://localhost:8000",
|
BaseURL: "http://backend:8000",
|
||||||
LoginURL: "https://unstabilising-lora-unframable.ngrok-free.dev/api/v1/auth/complete?token=",
|
LoginURL: "https://unstabilising-lora-unframable.ngrok-free.dev/api/v1/auth/complete?token=",
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user