Merge pull request #21 from ladesa-ro/main

chore(cd): vars.REGISTRY_GHCR
ladesa-ro · Dec 1, 2024 · 9a81c57 · 9a81c57
2 parents 105a8c1 + 23db698
commit 9a81c57
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 14 deletions.
diff --git a/.devops/values.common.yml b/.devops/values.common.yml
@@ -1,19 +1,13 @@
 applicationName: ladesa-ro-sso
 
-service:
-  enabled: true
-  type: NodePort
-  ports:
-    - name: ladesa-ro-sso
-      port: 80
-      targetPort: web
-
 deployment:
   enabled: false
 
   replicas: 1
 
-  containerSecurityContext: false
+  containerSecurityContext:
+    runAsNonRoot: false
+    readOnlyRootFilesystem: false
 
   ports:
     - containerPort: 8080
@@ -41,5 +35,13 @@ deployment:
     timeoutSeconds: 1
     failureThreshold: 20
 
+service:
+  enabled: true
+  type: NodePort
+  ports:
+    - name: ladesa-ro-sso
+      port: 80
+      targetPort: web
+
 ingress:
   enabled: false
diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
@@ -17,16 +17,16 @@ jobs:
     runs-on: ubuntu-latest
 
     environment:
-      name: ${{ github.ref_name == 'main' && 'development' || 'production' }}
+      name: production
 
     steps:
       - uses: ladesa-ro/esteira-ci-cd/actions/prepare-images-builder@main
         with:
           setup-qemu: "false"
           push-image: "true"
-          push-image-registry-url: ${{ secrets.REGISTRY_URL }}
-          push-image-registry-username: ${{ secrets.REGISTRY_USERNAME }}
-          push-image-registry-token: ${{ secrets.REGISTRY_TOKEN }}
+          push-image-registry-url: ${{ vars.REGISTRY_GHCR == 'true' && 'ghcr.io' || secrets.REGISTRY_URL}}
+          push-image-registry-username: ${{ vars.REGISTRY_GHCR == 'true' && github.actor || secrets.REGISTRY_USERNAME }}
+          push-image-registry-token: ${{ vars.REGISTRY_GHCR == 'true' && secrets.GITHUB_TOKEN || secrets.REGISTRY_TOKEN }}
 
       - uses: ladesa-ro/esteira-ci-cd/actions/image-build-push@main
         with:
@@ -46,7 +46,7 @@ jobs:
     needs: [cd_build_push]
 
     environment:
-      name: ${{ github.ref_name == 'main' && 'development' || 'production' }}
+      name: production
       url: ${{ vars.DEPLOY_URL }}
 
     steps: