From 670165396419644f8cfe8a9134e9f7a70c7a2f5e Mon Sep 17 00:00:00 2001 From: skeris Date: Sun, 5 Jan 2025 15:27:06 +0300 Subject: [PATCH] configs --- Dockerfile | 6 ++-- deployments/staging/docker-compose.yaml | 32 +++++++++----------- internal/app/app.go | 2 +- internal/controller/tariff_external/route.go | 2 +- 4 files changed, 19 insertions(+), 23 deletions(-) diff --git a/Dockerfile b/Dockerfile index 9ce2af3..f71b042 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,11 +2,9 @@ FROM gitea.pena/penadevops/container-images/golang:main as build WORKDIR /app ENV GOPRIVATE=gitea.pena/PenaSide/common,gitea.pena/PenaSide/linters-golang,gitea.pena/PenaSide/customer,gitea.pena/PenaSide/trashlog,gitea.pena/PenaSide/hlog ENV GOINSECURE=gitea.pena/PenaSide/common,gitea.pena/PenaSide/linters-golang,gitea.pena/PenaSide/customer,gitea.pena/PenaSide/trashlog,gitea.pena/PenaSide/hlog -ENV GOPROXY=https://proxy.golang.org,direct -ENV GOPATH=go-cache -COPY . . +COPY . /app RUN go mod download -RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o app +RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o app ./cmd/main.go FROM gitea.pena/penadevops/container-images/alpine:main RUN apk add --no-cache ca-certificates diff --git a/deployments/staging/docker-compose.yaml b/deployments/staging/docker-compose.yaml index 060b36d..48236dc 100644 --- a/deployments/staging/docker-compose.yaml +++ b/deployments/staging/docker-compose.yaml @@ -1,24 +1,22 @@ version: "3.3" services: - admin: - container_name: hub-admin-backend-service + tariffs: restart: unless-stopped tty: true - image: $CI_REGISTRY_IMAGE/staging:$CI_COMMIT_REF_SLUG.$CI_PIPELINE_ID + image: gitea.pena:3000/penaside/tariffs/staging:$GITHUB_RUN_NUMBER ports: - - 10.8.0.6:59303:8005 - networks: - - default + - 10.7.0.6:59303:8005 + - 10.7.0.6:59304:8006 environment: - - DB_HOST=10.8.0.6 - - DB_PORT=27017 - - ENVIRONMENT=staging - - HTTP_HOST=0.0.0.0 - - HTTP_PORT=8005 - - AUTH_SERVICE_HOST=http://10.8.0.6 - - AUTH_SERVICE_PORT=59300 - - DB_USERNAME=$DB_USERNAME - - DB_PASSWORD=$DB_PASSWORD - - DB_NAME=administrator - - PUBLIC_ACCESS_SECRET_KEY=$PUBLIC_ACCESS_SECRET_KEY + MONGO_URL: mongodb://administrator:64143ffdd9304865586e5cf1@10.7.0.6:27017/administrator?authSource=administrator + MONGO_DB_NAME: administrator + DB_HOST: 10.7.0.6 + DB_PORT: 27017 + ENVIRONMENT: staging + INTERNAL_HTTP_ADDRESS: 0.0.0.0:8006 + EXTERNAL_HTTP_ADDRESS: 0.0.0.0:8005 + AUTH_SERVICE_HOST: http://10.7.0.6 + AUTH_SERVICE_PORT: 59300 + JWT_PUBLIC_KEY: "-----BEGIN PUBLIC KEY-----\nMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCLW1tlHyKC9AG0hGpmkksET2DE\nr7ojSPemxFWAgFgcPJWQ7x3uNbsdJ3bIZFoA/FClaWKMCZmjnH9tv0bKZtY/CDhM\nZEyHpMruRSn6IKrxjtQZWy4uv/w6MzUeyBYG0OvNCiYpdvz5SkAGAUHD5ZNFqn2w\nKKFD0I2Dr59BFVSGJwIDAQAB\n-----END PUBLIC KEY-----" + PUBLIC_ACCESS_SECRET_KEY: "-----BEGIN PUBLIC KEY-----\nMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCLW1tlHyKC9AG0hGpmkksET2DE\nr7ojSPemxFWAgFgcPJWQ7x3uNbsdJ3bIZFoA/FClaWKMCZmjnH9tv0bKZtY/CDhM\nZEyHpMruRSn6IKrxjtQZWy4uv/w6MzUeyBYG0OvNCiYpdvz5SkAGAUHD5ZNFqn2w\nKKFD0I2Dr59BFVSGJwIDAQAB\n-----END PUBLIC KEY-----" diff --git a/internal/app/app.go b/internal/app/app.go index 3660260..fb471a6 100644 --- a/internal/app/app.go +++ b/internal/app/app.go @@ -19,7 +19,7 @@ func Run(ctx context.Context, cfg initialize.Config, logger *zap.Logger) error { } }() - logger.Info("Starting application", zap.String("AppName", cfg.AppName)) + logger.Info("Starting application", zap.Any("AppCFG", cfg)) ctx, cancel := context.WithCancel(ctx) defer cancel() diff --git a/internal/controller/tariff_external/route.go b/internal/controller/tariff_external/route.go index 5f2e7e9..9f34fff 100644 --- a/internal/controller/tariff_external/route.go +++ b/internal/controller/tariff_external/route.go @@ -3,8 +3,8 @@ package tariff_external import "github.com/gofiber/fiber/v2" func (t *TariffExternal) Register(router fiber.Router) { - router.Get("/:id", t.Get) router.Get("/getList", t.GetList) + router.Get("/:id", t.Get) router.Post("/", t.Create) }