Merge pull request #34 from Djelibeybi/tidy-devops-actions-example

Tidy up the OCI DevOps deployment with GitHub Actions examples

Author: RahulMR42

oci-deployment-examples/oci-devops-githubactions-deploy/.github/workflows/oci_actions.yml

@@ -1,14 +1,14 @@
 name: OCI Deploy
 # Controls when the workflow will run
 on:
-  # Triggers the workflow on push or pull request events but only for the "dev" branch
+  # Triggers the workflow on push or pull request events but only for the "main" branch
   push:
     branches: [ "main"]
 
 jobs:
   get-ocir-repository-test:
     runs-on: ubuntu-latest
-    name: Invoke OCI Deployment on to OKE .
+    name: Invoke OCI Deployment on to OKE
     env:
       OCI_CLI_USER: ${{ secrets.OCI_CLI_USER }}
       OCI_CLI_TENANCY: ${{ secrets.OCI_CLI_TENANCY }}
@@ -17,6 +17,9 @@ jobs:
       OCI_CLI_REGION: ${{ secrets.OCI_CLI_REGION }}
 
     steps:
+      - name: Check out code
+        uses: actions/checkout@v2
+
       - name: Get or create an OCIR Repository
         uses: oracle-actions/[email protected]
         id: get-ocir-repository
@@ -30,36 +33,19 @@ jobs:
         with:
           auth_token: ${{ secrets.OCI_AUTH_TOKEN }}
 
-      - name: Check out code
-        uses: actions/checkout@v2
-
       - name: Tag and push a container image
         id: tag-and-push-image
         run: |
-          ls -ltr
-          docker build -t "${{ steps.get-ocir-repository.outputs.repo_path }}:${{github.run_number}}" .
-          docker push "${{ steps.get-ocir-repository.outputs.repo_path }}:${{github.run_number}}"
-
+          docker build -t "${{ steps.get-ocir-repository.outputs.repo_path }}:$GITHUB_RUN_NUMBER" .
+          docker push "${{ steps.get-ocir-repository.outputs.repo_path }}:$GITHUB_RUN_NUMBER"
 
       - name: Generate deploy arguments
         id: create-json
         run: |
-          echo "::set-output name=metadata::{\"created_by\":\"$GITHUB_ACTOR\",\"triggered_by\":\"$GITHUB_EVENT_NAME\"}"
           echo "::set-output name=deployargs::{\"items\":[{\"name\":\"namespace\",\"value\":\"ns-github\"},{\"name\":\"image_tag\",\"value\":\"$GITHUB_RUN_NUMBER\"}]}"
 
-
-      - name: Display and save the generated JSON
-        run: |
-          echo '${{ steps.create-json.outputs.metadata }}' | jq
-          echo '${{ steps.create-json.outputs.deployargs }}'
-
-
       - name: Invoke deployment pipeline
         uses: oracle-actions/[email protected]
         id:  invoke-deployments
         with:
           command: devops deployment create-pipeline-deployment --pipeline-id ${{ secrets.DEPLOYMENT_PIPELINE_OCID }} --deployment-arguments ${{ toJSON(steps.create-json.outputs.deployargs) }}
-          silent: false
-
-
-