main deployment rule

.gitea/workflows/deploy.yml

@@ -1,34 +0,0 @@
-name: Deploy
-run-name: ${{ gitea.actor }} build image and push to container registry
-
-on: 
-  push:
-    branches:
-      - 'main'
-      - 'staging'
-
-jobs:
-  CreateImage:
-    runs-on: [frontstaging]
-    uses: http://gitea.pena/PenaDevops/actions.git/.gitea/workflows/build-image.yml@v1.1.6-p
-    with:
-      runner: frontstaging
-    secrets:
-      REGISTRY_USER: ${{ secrets.REGISTRY_USER }}
-      REGISTRY_PASSWORD: ${{ secrets.REGISTRY_PASSWORD }}
-  DeployService:
-    runs-on: [frontstaging]
-    container:
-      image: gitea.pena:3000/penadevops/container-images/node-compose:main
-      env:
-        GITHUB_RUN_NUMBER: "${{ inputs.actionid }}"
-      volumes:
-        - /run/user/1000/podman/podman.sock:/run/user/1000/podman/podman.sock
-    steps:
-      - name: Check out repository code
-        uses: http://gitea.pena:3000/PenaDevops/actions.git/checkout@v1
-      - run: printenv
-      - run: GITHUB_RUN_NUMBER=${{ gitea.run_id }} compose -f deployments/${{ gitea.ref_name }}/docker-compose.yaml up -d
-    # uses: http://gitea.pena/PenaDevops/actions.git/.gitea/workflows/deploy.yml@v1.1.6-p
-    # with:
-    #   runner: frontstaging

.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: [frontstaging]
+    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: [frontprod]
+    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

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

.gitea/workflows/lint.yml

@@ -4,11 +4,11 @@ run-name: ${{ gitea.actor }} produce linting
 on:
   push:
     branches:
-      - 'sdev'
+      - 'dev'
 
 jobs:
   Lint:
     runs-on: [hubstaging]
-    uses: http://gitea.pena/PenaDevops/actions.git/.gitea/workflows/lint.yml@v1.1.2
+    uses: http://gitea.pena/PenaDevops/actions.git/.gitea/workflows/lint.yml@v1.1.0
     with:
       runner: hubstaging

.gitlab-ci.yml

@@ -1,27 +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/service-discovery.gitlab-ci.yml"
-stages:
-  - build
-  - deploy
-  - service-discovery
-
-build-app:
-  extends: .build_template
-  variables:
-    DOCKER_BUILD_PATH: "./Dockerfile"
-    STAGING_BRANCH: "main"
-    PRODUCTION_BRANCH: "main"
-
-deploy-to-staging:
-  extends: .deploy_template
-  variables:
-    DEPLOY_TO: "staging"
-    BRANCH: "main"
-
-service-discovery:
-  extends: .sd_artefacts_template

deployments/main/docker-compose.yaml

@@ -1,16 +1,10 @@
-version: "3"
 services:
   squizlanding:
     container_name: squizlanding
     restart: unless-stopped
-    image: $CI_REGISTRY_IMAGE/main:$CI_COMMIT_REF_SLUG.$CI_PIPELINE_ID
+    image: gitea.pena/landings/squiz/main:$GITHUB_RUN_NUMBER
-    networks:
-      - marketplace_penahub_frontend
     labels:
       com.pena.domains: newerait.pena.digital
     hostname: squizlanding
     tty: true
-networks:
-  marketplace_penahub_frontend:
-    external: true