ci prod

.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

.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:

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

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