ci prod

.gitea/workflows/deployProd.yml

@@ -0,0 +1,26 @@
+name: Deploy
+run-name: ${{ gitea.actor }} build image and push to container registry
+
+on:
+  push:
+    branches:
+      - 'main'
+
+jobs:
+  CreateImage:
+    runs-on: [hubstaging]
+    uses: https://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: https://gitea.pena/PenaDevops/actions.git/.gitea/workflows/deploy.yml@v1.1.4-p7
+    with:
+      runner: hubprod
+      actionid: ${{ gitea.run_id }}
+    
+

.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,36 +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:
-  extends: .deploy_template
-  rules:
-    - if: "$CI_COMMIT_BRANCH == $STAGING_BRANCH"
-
-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,61 +1,46 @@
-version: "3.3"
-
 services:
   customer-appv1.0.0:
-    hostname: customer-servicev1.0.0
-    container_name: customer-servicev1.0.0
-    image: $CI_REGISTRY_IMAGE/main:$CI_COMMIT_REF_SLUG.$CI_PIPELINE_ID
+    image: gitea.pena/penaside/customer/main:$GITHUB_RUN_NUMBER
     tty: true
+    labels:
+      com.pena.allowed_headers: content-type,authorization,response-type
     environment:
-      - CLIENT_HTTP_HOST=0.0.0.0
-      - CLIENT_HTTP_PORT=8065
-      - ADMIN_HTTP_HOST=0.0.0.0
-      - ADMIN_HTTP_PORT=8066
+      CLIENT_HTTP_URL: 0.0.0.0:8065
+      ADMIN_HTTP_URL: 0.0.0.0:8066
 
-      - GRPC_HOST=0.0.0.0
-      - GRPC_PORT=9065
-      - GRPC_DOMEN=10.8.0.8:9065
+      GRPC_URL: 0.0.0.0:9065
+      GRPC_DOMAIN: 10.8.0.226:9060
 
-      - MONGO_HOST=10.8.0.8
-      - MONGO_PORT=27017
-      - MONGO_USER=$MONGO_USER-prod
-      - MONGO_PASSWORD=$MONGO_PASSWORD
-      - MONGO_DB_NAME=customer
-      - MONGO_AUTH=customer
-      - NOTIFICATION_RS_PAY_CHANNEL=-1002338593104
+      MONGO_URL: mongodb://customer:WAR2Fr6SuPKhtvEp@localhost:27017/?authSource=customer
+      MONGO_DB_NAME: customer-prod
+      TELEGRAM_RS_PAY_CHANNEL_ID: -1002338593104
+      TELEGRAM_NOTIFICATION_CHANNEL_ID: -1002017928045
 
-      - KAFKA_BROKERS=10.8.0.8:9092
-      - KAFKA_TOPIC_TARIFF=tariffs
+      KAFKA_BROKERS: 10.8.0.226:9092
+      KAFKA_TOPIC_TARIFF: tariffs
 
-      - AUTH_MICROSERVICE_USER_URL=http://10.8.0.8:59300/user
-      - HUBADMIN_MICROSERVICE_TARIFF_URL=http://10.8.0.8:59303/tariff
-      - CURRENCY_MICROSERVICE_TRANSLATE_URL=http://10.8.0.8:3131/change
-      - DISCOUNT_MICROSERVICE_GRPC_HOST=10.8.0.8:9001
-      - PAYMENT_MICROSERVICE_GRPC_HOST=10.8.0.8:9085
-      - VERIFICATION_MICROSERVICE_USER_URL=http://10.8.0.8:7035/verification
-      - TEMPLATEGEN_MICROSERVICE_URL=10.6.0.17
-      - CODEWORD_MICROSERVICE_GRPC_HOST=10.8.0.8:59665
-      - API_URL=https://api.smtp.bz/v1/smtp/send
-      - MAIL_SENDER=noreply@noreply.pena.digital
-      - MAIL_API_KEY=8tv2xcsfCMBX3TCQxzgeeEwAEYyQrPUp0ggw
-      - MAIL_AUTH_USERNAME=team@pena.digital
-      - MAIL_AUTH_PASSWORD=AyMfwqA9LkQH
-      - MAIL_ADDRESS=sells@pena.digital
+      AUTH_MICROSERVICE_URL: http://10.8.0.226:59300
+      HUBADMIN_MICROSERVICE_URL: http://10.8.0.226:59304
+      CURRENCY_MICROSERVICE_URL: http://10.8.0.226:3131
+      DISCOUNT_MICROSERVICE_GRPC_URL: 10.8.0.226:9001
+      PAYMENT_MICROSERVICE_GRPC_URL: 10.8.0.226:9085
+      VERIFICATION_MICROSERVICE_URL: http://10.8.0.226:7036
+      TEMPLATEGEN_MICROSERVICE_URL: http://10.8.0.226:8012
+      API_URL: https://api.smtp.bz/v1/smtp/send
+      CODEWORD_MICROSERVICE_GRPC_URL: 10.8.0.226:59665
+      MAIL_SENDER: noreply@noreply.pena.digital
+      MAIL_API_KEY: 8tv2xcsfCMBX3TCQxzgeeEwAEYyQrPUp0ggw
+      MAIL_ADDRESS: team@pena.digital
+      JWT_PUBLIC_KEY: "-----BEGIN PUBLIC KEY-----\nMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCLW1tlHyKC9AG0hGpmkksET2DE\nr7ojSPemxFWAgFgcPJWQ7x3uNbsdJ3bIZFoA/FClaWKMCZmjnH9tv0bKZtY/CDhM\nZEyHpMruRSn6IKrxjtQZWy4uv/w6MzUeyBYG0OvNCiYpdvz5SkAGAUHD5ZNFqn2w\nKKFD0I2Dr59BFVSGJwIDAQAB\n-----END PUBLIC KEY-----"
+      JWT_ISSUER: pena-auth-service
+      JWT_AUDIENCE: pena
 
-
-      - JWT_PUBLIC_KEY=$JWT_PUBLIC_KEY
-      - JWT_ISSUER=pena-auth-service
-      - JWT_AUDIENCE=pena
-      - PUBLIC_KEY=$USER_PKEY
-      - PRIVATE_KEY=$USER_PRIVATEKEY
-      - ADMIN_FRONT_URL=https://admin.pena
-      - TRASH_LOG_HOST=10.8.0.15:7113
-      - MODULE_LOGGER=customer-main
-      - NOTIFICATION_CHANNEL=-1002017928045
-      - NOTIFICATION_BOT_TOKEN=6112841016:AAH2nO1c6mqfMewBvHwdXCDp5PCclOuc99s
+      ENCRYPT_PUBLIC_KEY: '-----BEGIN PUBLIC KEY-----\nMIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEAn/Q3CKvaxK4YR3N3Iy8O\nIOs218oDQIwoHpmRh3a9V+vTEqT+rY8/Dkf5cnbTMuEBFP1NYtS+pcSFF7nLlZdm\nVb6rhtjLCV0awogeWxJsXCHBOHF7Fv4iqDa85qMwl7XiVXxKo/9kH9TkPsgFsuYt\nvL4Xc1u6ogoYeVHP7ULDMxgmdLd2N9VIVphxsiGDq304NbgWFVr47/J3x3DU0bw+\nF5QdI7ScU/m4T3S0WlhFaG0hblVbH8x+8U81F9OIyJCX9tGZYb6eR3v1pnWP191L\nkpJPSlj9cPPJhl3d6bCyYzGv6k8KQClSs8lsSklPrcXl0ut3raC+oEFp2JkHQL7R\nUlwPr2ZOt9DTTs7l70gvr8FswO4/N6+t+6spce2s3lwN41BWGWHYcc9PuOHqUQTw\nJ3IQQU6NmAyZOjDiZJw7uoNG2rtCqWQRykTULZvtfxh3lMXI/qKM1em+Qo3AZnKC\nY01xhCr4ahPs9Rb4eReigTJSzq+IRSJa1+xPaR4dNm6tAgMBAAE=\n-----END PUBLIC KEY-----'
+      ENCRYPT_PRIVATE_KEY: '-----BEGIN RSA PRIVATE KEY-----\n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\n-----END RSA PRIVATE KEY-----'
+      ADMIN_FRONT_URL: https://admin.pena
+      TRASH_LOG_HOST: 10.8.0.200:7123
+      TELEGRAM_TOKEN: 6112841016:AAH2nO1c6mqfMewBvHwdXCDp5PCclOuc99s
     ports:
-      - 10.8.0.8:8066:8065
-      - 10.8.0.8:8031:8066
-      - 10.8.0.8:9066:9065
-    networks:
-      - default
+      - 10.8.0.226:8066:8065
+      - 10.8.0.226:8031:8066
+      - 10.8.0.226:9066:9065