From 4f951af513a2fe732fe86cc4d51fd5b4d422582e Mon Sep 17 00:00:00 2001
From: skeris <kotilion.95@gmail.com>
Date: Mon, 24 Feb 2025 16:44:43 +0300
Subject: [PATCH] ci prod

---
 .gitea/workflows/deployProd.yml               | 24 +++++++++++++++
 .../{deploy.yml => deployStaging.yml}         |  0
 deployments/main/docker-compose.yaml          | 30 ++++++++-----------
 3 files changed, 36 insertions(+), 18 deletions(-)
 create mode 100644 .gitea/workflows/deployProd.yml
 rename .gitea/workflows/{deploy.yml => deployStaging.yml} (100%)

diff --git a/.gitea/workflows/deployProd.yml b/.gitea/workflows/deployProd.yml
new file mode 100644
index 0000000..02e8104
--- /dev/null
+++ b/.gitea/workflows/deployProd.yml
@@ -0,0 +1,24 @@
+name: Deploy
+run-name: ${{ gitea.actor }} build image and push to container registry
+
+on: 
+  push:
+    branches:
+      - 'main'
+      - 'staging'
+
+jobs:
+  CreateImage:
+    runs-on: [hubstaging]
+    uses: http://gitea.pena/PenaDevops/actions.git/.gitea/workflows/build-image.yml@v1.1.6-p
+    with:
+      runner: hubstaging
+    secrets:
+      REGISTRY_USER: ${{ secrets.REGISTRY_USER }}
+      REGISTRY_PASSWORD: ${{ secrets.REGISTRY_PASSWORD }}
+  DeployService:
+    runs-on: [hubprod]
+    needs: CreateImage
+    uses: http://gitea.pena/PenaDevops/actions.git/.gitea/workflows/deploy.yml@v1.1.4-p7
+    with:
+      runner: hubprod
diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deployStaging.yml
similarity index 100%
rename from .gitea/workflows/deploy.yml
rename to .gitea/workflows/deployStaging.yml
diff --git a/deployments/main/docker-compose.yaml b/deployments/main/docker-compose.yaml
index 5f3ec2e..140c430 100644
--- a/deployments/main/docker-compose.yaml
+++ b/deployments/main/docker-compose.yaml
@@ -1,24 +1,18 @@
-version: "3.3"
-
 services:
   admin:
-    container_name: hub-admin-backend-service
     restart: unless-stopped
     tty: true
-    image: $CI_REGISTRY_IMAGE/main:$CI_COMMIT_REF_SLUG.$CI_PIPELINE_ID
+    image: gitea.pena/penaside/tariffs/main:$GITHUB_RUN_NUMBER
     ports: 
-      - 10.8.0.8:59303:8005
-    networks:
-      - default
+      - 10.8.0.226:59303:8005
+      - 10.8.0.226:59304:8006
     environment:
-      - DB_HOST=10.8.0.8
-      - DB_PORT=27017
-      - ENVIRONMENT=staging
-      - HTTP_HOST=0.0.0.0
-      - HTTP_PORT=8005
-      - AUTH_SERVICE_HOST=http://10.8.0.8
-      - AUTH_SERVICE_PORT=59300
-      - DB_USERNAME=$DB_USERNAME-prod
-      - DB_PASSWORD=$DB_PASSWORD
-      - DB_NAME=administrator
-      - PUBLIC_ACCESS_SECRET_KEY=$PUBLIC_ACCESS_SECRET_KEY
+      MONGO_URL: mongodb://administrator-prod:64143ffdd9304865586e5cf1@localhost:27017/administrator?authSource=administrator
+      MONGO_DB_NAME: administrator
+      ENVIRONMENT: production
+      INTERNAL_HTTP_ADDRESS: 0.0.0.0:8006
+      EXTERNAL_HTTP_ADDRESS: 0.0.0.0:8005
+      AUTH_SERVICE_HOST: http://10.8.0.226
+      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-----"