From 8fe985b96469b8d800b7c87bb3e429605eb7eebe Mon Sep 17 00:00:00 2001
From: skeris <kotilion.95@gmail.com>
Date: Sun, 23 Feb 2025 20:21:07 +0300
Subject: [PATCH] ci prod

---
 .gitea/workflows/deployProd.yml               | 23 +++++++++++++++++
 .../{deploy.yml => deployStaging.yml}         |  1 -
 deployments/main/docker-compose.yaml          | 25 +++++--------------
 deployments/staging/docker-compose.yaml       |  4 +--
 4 files changed, 30 insertions(+), 23 deletions(-)
 create mode 100644 .gitea/workflows/deployProd.yml
 rename .gitea/workflows/{deploy.yml => deployStaging.yml} (97%)

diff --git a/.gitea/workflows/deployProd.yml b/.gitea/workflows/deployProd.yml
new file mode 100644
index 0000000..1acf9c5
--- /dev/null
+++ b/.gitea/workflows/deployProd.yml
@@ -0,0 +1,23 @@
+name: Deploy
+run-name: ${{ gitea.actor }} build image and push to container registry
+
+on: 
+  push:
+    branches:
+      - 'main'
+
+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 97%
rename from .gitea/workflows/deploy.yml
rename to .gitea/workflows/deployStaging.yml
index 5d17c60..253c2d4 100644
--- a/.gitea/workflows/deploy.yml
+++ b/.gitea/workflows/deployStaging.yml
@@ -4,7 +4,6 @@ run-name: ${{ gitea.actor }} build image and push to container registry
 on: 
   push:
     branches:
-      - 'main'
       - 'staging'
 
 jobs:
diff --git a/deployments/main/docker-compose.yaml b/deployments/main/docker-compose.yaml
index 46681ef..3e158cc 100644
--- a/deployments/main/docker-compose.yaml
+++ b/deployments/main/docker-compose.yaml
@@ -1,10 +1,6 @@
-version: "3.3"
-
 services:
   treasurer-app-prod:
-    hostname: treasurer-service-prod
-    container_name: treasurer-service-prod
-    image: $CI_REGISTRY_IMAGE/main:$CI_COMMIT_REF_SLUG.$CI_PIPELINE_ID
+    image: gitea.pena/penaside/treasurer/main:$GITHUB_RUN_NUMBER
     tty: true
     environment:
       - HTTP_HOST=0.0.0.0
@@ -21,21 +17,12 @@ services:
       - YOOMONEY_PAYMENTS_URL=https://api.yookassa.ru/v3/payments
       - YOOMONEY_WEBHOOKS_URL=http://treasurer-mock-staging:8080/webhooks
 
-      - MONGO_HOST=10.8.0.8
+      - MONGO_HOST=localhost
       - MONGO_PORT=27017
-      - MONGO_USER=$MONGO_USER-prod
-      - MONGO_PASSWORD=$MONGO_PASSWORD
+      - MONGO_USER=treasurer-prod
+      - MONGO_PASSWORD=Wr5uCLwIu7CEeWT3
       - MONGO_DB_NAME=treasurer
       - MONGO_AUTH=treasurer
     ports:
-      - 10.8.0.8:8085:8085
-      - 10.8.0.8:9085:9085
-    networks:
-      - backend_external
-      - default
-networks:
-  backend_external:
-    driver: bridge
-    attachable: true
-    internal: true
-
+      - 10.8.0.226:8085:8085
+      - 10.8.0.226:9085:9085
diff --git a/deployments/staging/docker-compose.yaml b/deployments/staging/docker-compose.yaml
index 39f2c64..0768811 100644
--- a/deployments/staging/docker-compose.yaml
+++ b/deployments/staging/docker-compose.yaml
@@ -1,8 +1,6 @@
-version: "3.3"
-
 services:
   treasurer-app-staging:
-    image: gitea.pena:3000/penaside/treasurer/staging:$GITHUB_RUN_NUMBER
+    image: gitea.pena/penaside/treasurer/staging:$GITHUB_RUN_NUMBER
     tty: true
     environment:
       - HTTP_HOST=0.0.0.0