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:

.gitlab-ci.yml

@@ -1,38 +0,0 @@
-include:
-  - project: "devops/pena-continuous-integration"
-    file: "/templates/docker/build-template.gitlab-ci.yml"
-  - project: "devops/pena-continuous-integration"
-    file: "/templates/docker/deploy-template.gitlab-ci.yml"
-  - project: "devops/pena-continuous-integration"
-    file: "/templates/docker/golint.gitlab-ci.yml"
-  - project: "devops/pena-continuous-integration"
-    file: "/templates/docker/service-discovery.gitlab-ci.yml"
-stages:
-  - lint
-  - build
-  - deploy
-  - service-discovery
-
-lint:
-  extends: .golint_template
-
-build-app:
-  extends: .build_template
-
-deploy-to-staging:
-  rules:
-    - if: "$CI_COMMIT_BRANCH == $STAGING_BRANCH"
-  extends: .deploy_template
-  tags:
-    - staging
-  extends: .deploy_template
-
-deploy-to-prod:
-  rules:
-    - if: "$CI_COMMIT_BRANCH == $PRODUCTION_BRANCH"
-  tags:
-    - prod
-  extends: .deploy_template
-
-service-discovery:
-  extends: .sd_artefacts_template

deployments/main/docker-compose.yaml

@@ -1,36 +1,33 @@
-version: "3"
 services:
   verificationv1.0.0:
-    container_name: verification_servicev1.0.0
     restart: unless-stopped
-    image: $CI_REGISTRY_IMAGE/main:$CI_COMMIT_REF_SLUG.$CI_PIPELINE_ID
+    image: gitea.pena/penaside/verification/main:$GITHUB_RUN_NUMBER
-    hostname: verification_servicev1.0.0
     ports:
-      - 10.8.0.8:7037:7035
+      - 10.8.0.226:7036:7035
-      - 10.8.0.8:7038:7036
+      - 10.8.0.226:7037:7036
+      - 10.8.0.226:7137:2345
+      
+
+
+
+
     environment:
-      MONGO_URI: mongodb://$MONGO_USER-prod:$MONGO_PASSWORD@10.8.0.8:27017/?authSource=verification
+      TELEGRAM_TOKEN: "6414077478:AAFk03HezovLT2kO_i9OYswH8Weirsgp9GU"
-      PENADISK_URL: $PENADISK_URL
-      TELEGRAM_TOKEN: $TELEGRAM_TOKEN
       TELEGRAM_CHANNEL_ID: -1001940097056
+      CLIENT_HTTP_URL: ":7035"
+      ADMIN_HTTP_URL: ":7036"
       S3_ENDPOINT: s3.timeweb.cloud
       S3_ACCESS_KEY_ID: 5CV77KVDUU9H0II9R24M
       S3_SECRET_KEY: 0W0m8DyvdAKRJnsAy6mB5zndQ7RouJBLhqhtThcu
-      JWT_SECRET: $JWT_SECRET
-      HTTP_ADDRESS_USER: ":7035"
-      HTTP_ADDRESS_ADMIN: ":7036"
-      MONGO_HOST: "10.8.0.8"
-      MONGO_PORT: "27017"
-      MONGO_USER: $MONGO_USER-prod
-      MONGO_PASSWORD: $MONGO_PASSWORD
-      MONGO_AUTH: "verification"
-      MONGO_DATABASE_NAME: "verification"
-      CUSTOMER_SVC_ADDRESS: "http://10.8.0.8:9066"
-      STAGING_URL: "https://admin.pena"
       S3_FOLDER: verification
       S3_FILE_URL: https://3c580be9-cf31f296-d055-49cf-b39e-30c7959dc17b.s3.timeweb.cloud
-      CUSTOMER_RPC_HOST: 10.8.0.8:9066
+      CUSTOMER_MICROSERVICE_RPC_URL: "http://10.8.0.226:9065"
-      TRASH_LOG_HOST: 10.8.0.15:7113
+      VERIFICATION_MICROSERVICE_URL: "https://admin.pena"
+      CUSTOMER_RPC_HOST: 10.8.0.226:9060
+      TRASH_LOG_HOST: 10.8.0.200:7123
+      MODULE_LOGGER: staging-verification
+      MONGO_URL: mongodb://verification-prod:54143ffdd9304865586e5cf1@localhost:27017/?authSource=verification
       MODULE_LOGGER: production-verification
+      JWT_SECRET: "-----BEGIN PUBLIC KEY-----\nMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCLW1tlHyKC9AG0hGpmkksET2DE\nr7ojSPemxFWAgFgcPJWQ7x3uNbsdJ3bIZFoA/FClaWKMCZmjnH9tv0bKZtY/CDhM\nZEyHpMruRSn6IKrxjtQZWy4uv/w6MzUeyBYG0OvNCiYpdvz5SkAGAUHD5ZNFqn2w\nKKFD0I2Dr59BFVSGJwIDAQAB\n-----END PUBLIC KEY-----"
 
     tty: true