From 69229ea4d2cc2407ce8222bb6c0cbf738ad6d383 Mon Sep 17 00:00:00 2001 From: saeid_01 Date: Fri, 16 Jun 2023 11:06:00 +0330 Subject: [PATCH] feat: redirect to .com --- .drone.yml | 11 ++++++++++ .values.yaml | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++ composer.json | 11 +++++++++- 3 files changed, 81 insertions(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index dee567f1..5bdd1256 100644 --- a/.drone.yml +++ b/.drone.yml @@ -84,6 +84,17 @@ steps: - pull_request - push + +image_pull_secrets: + - regcred + +--- +kind: secret +name: regcred +get: + path: regcred + name: .dockerconfigjson + --- kind: secret name: registry_token diff --git a/.values.yaml b/.values.yaml index f82f7d71..3c16b871 100644 --- a/.values.yaml +++ b/.values.yaml @@ -281,6 +281,53 @@ deployment: # name: https # protocol: TCP + worker: + enabled: false + + # Additional labels for Deployment worker + additionalLabels: + # key: value + + # Annotations on deployments worker + annotations: + + # Replicas to be created worker + replicas: 1 + + # By default deploymentStrategy is set to rollingUpdate with maxSurge of 25% and maxUnavailable of 25% + # You can change type to `Recreate` or can uncomment `rollingUpdate` specification and adjust them to your usage. + strategy: + type: RollingUpdate + # rollingUpdate: + # maxSurge: 25% + # maxUnavailable: 25% + + # Additional label added on pod which is used in Service's Label Selector + podLabels: + # env: prod + + image: docker.willaspace.com/repository/docker-hosted/external-projects/cssd-back:latest + command: + - /usr/bin/supervisord + - -n + - -c + - /var/www/html/worker.conf + args: + envFrom: + - configMapRef: + name: balout-production-back-configmap + - secretRef: + name: balout-production-back-secret + + resources: + limits: + memory: 1Gi + cpu: 1 + requests: + memory: 1Gi + cpu: 1 + + ########################################################## # Add Storage volumes to the pods ########################################################## @@ -345,6 +392,7 @@ ingress: # List of host addresses to be exposed by this Ingress hosts: - host: cssd-doc.ir + - host: cssd-doc.com # Additional labels for this Ingress additionalLabels: @@ -360,6 +408,9 @@ ingress: - secretName: cssd-doc-ir-certificate hosts: - cssd-doc.ir + - secretName: cssd-doc-com-certificate + hosts: + - cssd-doc.com ########################################################## # Route object for exposing services (OpenShift) @@ -520,6 +571,15 @@ configMap: server { listen 80; + server_name cssd-doc.ir www.cssd-doc.ir; + + return 301 https://cssd-doc.com$request_uri; + } + + + server { + listen 80; + server_name cssd-doc.com www.cssd-doc.com; access_log /var/log/nginx/access.log main; error_log /var/log/nginx/error.log; diff --git a/composer.json b/composer.json index 1a6608cf..4a05fa15 100644 --- a/composer.json +++ b/composer.json @@ -66,5 +66,14 @@ "post-create-project-cmd": [ "@php artisan key:generate --ansi" ] - } + }, + "repositories": [ + { + "type": "composer", + "url": "https://repo.willaspace.com/repository/composer-remote/" + }, + { + "packagist.org": false + } + ] }