Skip to content

Commit e3f38cd

Browse files
authored
Merge branch 'main' into dip-test
2 parents 84e2715 + 41b0699 commit e3f38cd

File tree

3 files changed

+18
-15
lines changed

3 files changed

+18
-15
lines changed

fn-ci-cd-deployment-pipeline/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ This is a reference yaml as an action workflow to build and deploy the OCI funct
1111

1212
Deploy a function using the Fn Project CLI, the function is built as a Docker image and pushed to a specified Docker registry.
1313

14-
- Provide value for non senstive information as an input and update during runtime.
14+
- Provide value for non senstive information as an workflow input and update during runtime.
1515

1616
```
1717
OCI_FN_NAME
@@ -20,7 +20,7 @@ Deploy a function using the Fn Project CLI, the function is built as a Docker im
2020
OCI_FN_IMAGE
2121
````
2222
23-
- Create environment variables for other non senstive information.
23+
- Create environment/git variables for other non senstive information.
2424
2525
```
2626
OCI_TENANCY_NAME
@@ -48,4 +48,4 @@ Licensed under the Universal Permissive License (UPL), Version 1.0.
4848
4949
See [LICENSE](LICENSE) for more details.
5050
51-
ORACLE AND ITS AFFILIATES DO NOT PROVIDE ANY WARRANTY WHATSOEVER, EXPRESS OR IMPLIED, FOR ANY SOFTWARE, MATERIAL OR CONTENT OF ANY KIND CONTAINED OR PRODUCED WITHIN THIS REPOSITORY, AND IN PARTICULAR SPECIFICALLY DISCLAIM ANY AND ALL IMPLIED WARRANTIES OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY, AND FITNESS FOR A PARTICULAR PURPOSE. FURTHERMORE, ORACLE AND ITS AFFILIATES DO NOT REPRESENT THAT ANY CUSTOMARY SECURITY REVIEW HAS BEEN PERFORMED WITH RESPECT TO ANY SOFTWARE, MATERIAL OR CONTENT CONTAINED OR PRODUCED WITHIN THIS REPOSITORY. IN ADDITION, AND WITHOUT LIMITING THE FOREGOING, THIRD PARTIES MAY HAVE POSTED SOFTWARE, MATERIAL OR CONTENT TO THIS REPOSITORY WITHOUT ANY REVIEW. USE AT YOUR OWN RISK.
51+
ORACLE AND ITS AFFILIATES DO NOT PROVIDE ANY WARRANTY WHATSOEVER, EXPRESS OR IMPLIED, FOR ANY SOFTWARE, MATERIAL OR CONTENT OF ANY KIND CONTAINED OR PRODUCED WITHIN THIS REPOSITORY, AND IN PARTICULAR SPECIFICALLY DISCLAIM ANY AND ALL IMPLIED WARRANTIES OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY, AND FITNESS FOR A PARTICULAR PURPOSE. FURTHERMORE, ORACLE AND ITS AFFILIATES DO NOT REPRESENT THAT ANY CUSTOMARY SECURITY REVIEW HAS BEEN PERFORMED WITH RESPECT TO ANY SOFTWARE, MATERIAL OR CONTENT CONTAINED OR PRODUCED WITHIN THIS REPOSITORY. IN ADDITION, AND WITHOUT LIMITING THE FOREGOING, THIRD PARTIES MAY HAVE POSTED SOFTWARE, MATERIAL OR CONTENT TO THIS REPOSITORY WITHOUT ANY REVIEW. USE AT YOUR OWN RISK.

fn-ci-cd-deployment-pipeline/oci-fn-build.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@ name: 'oci-fn-build'
22
permissions:
33
contents: read
44
on:
5-
# Trigger the workflow on push or pull request,
6-
# but only for the main branch
5+
# Add Trigger for push or pull request, if needed
76
workflow_dispatch:
87
inputs:
98
OCI_FN_APP:
@@ -19,7 +18,7 @@ on:
1918
description: OCIR Image to use for Function
2019
default: bom.ocir.io/bmpmwyacrlcj/repodip1/oci-logs-stream:0.0.19
2120
jobs:
22-
# This workflow contains a single job called "build"
21+
# This workflow contains a single job called "Build"
2322
Build:
2423
# The type of runner that the job will run on
2524
runs-on: ubuntu-latest

fn-ci-cd-deployment-pipeline/oci-fn-deploy.yml

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ name: 'oci-fn-deploy'
22
permissions:
33
contents: read
44
on:
5-
# Trigger the workflow on push or pull request,
6-
# but only for the main branch
5+
# Add Trigger for push or pull request, if needed
6+
77
workflow_dispatch:
88
inputs:
99
OCI_FN_APP:
@@ -17,12 +17,15 @@ on:
1717
default: oci-logs-stream
1818
OCI_FN_IMAGE:
1919
description: OCIR Image to use for Function
20-
default: bom.ocir.io/bmpmwyacrlcj/repodip1/oci-logs-stream:0.0.19
21-
OCI_TENANCY_NAME:
22-
description: Tenancy Name
23-
default: dipeshrathod60
20+
default: bom.ocir.io/<imagepath-oci:0.0.2>
21+
WORKFLOW_TYPE:
22+
description: Workflow Type for create or updae function
23+
type: choice
24+
options:
25+
- create
26+
- update
2427
jobs:
25-
# This workflow contains a single job called "build"
28+
# This workflow contains a single job called "Deploy"
2629
Deploy:
2730
runs-on: ubuntu-latest
2831

@@ -67,7 +70,8 @@ jobs:
6770
fn use context ${{ inputs.OCI_TENANCY_NAME }}
6871
fn update context registry ${{ vars.OCI_FN_REGISTRY }}
6972
fn update context oracle.compartment-id ${{ inputs.OCI_FN_COMPARTMENT }}
70-
fn update context api-url ${{ vars.OCI_FN_API_URL }}
73+
fn update context api-url ${{ vars.OCI_FN_API_URL }}
74+
7175
- name: 'Create or Update OCI Function'
7276
run: |
73-
fn update function ${{ inputs.OCI_FN_APP }} ${{ inputs.OCI_FN_NAME }} --image ${{ inputs.OCI_FN_IMAGE }}
77+
fn ${{ inputs.WORKFLOW_TYPE }} function ${{ inputs.OCI_FN_APP }} ${{ inputs.OCI_FN_NAME }} ${{ inputs.OCI_FN_IMAGE }}

0 commit comments

Comments
 (0)