Skip to content

Commit bd95b0d

Browse files
committed
update issue in deploy function
1 parent c96dcbd commit bd95b0d

File tree

3 files changed

+12
-13
lines changed

3 files changed

+12
-13
lines changed

security/security-design/shared-assets/fn-datasafe-dbaudit-to-oci-logging/files/terraform/function/oci-datasafe-audit-to-logging/func.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
schema_version: 20180708
22
name: oci-datasafe-audit-to-logging
33
version: 0.0.1
4-
runtime: python
4+
runtime: docker
55
build_image: fnproject/python:3.9-dev
66
run_image: fnproject/python:3.9
77
entrypoint: /python/bin/fdk /function/func.py handler

security/security-design/shared-assets/fn-datasafe-dbaudit-to-oci-logging/files/terraform/function_prep.tf

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,19 +22,19 @@ resource "null_resource" "functionapp_push2ocir" {
2222
working_dir = "${path.module}/${local.fn_working_dir}"
2323
}
2424

25-
#provisioner "local-exec" {
26-
# command = "fn build --verbose"
27-
# working_dir ="${path.module}/${local.fn_working_dir}"
28-
#}
25+
provisioner "local-exec" {
26+
#command = "fn build --verbose"
27+
command = "docker buildx build --push --platform linux/arm64/v8,linux/amd64"
28+
working_dir ="${path.module}/${local.fn_working_dir}"
29+
}
2930

30-
#provisioner "local-exec" {
31-
# command = "image=$(docker images | grep ${var.functionname} | awk -F ' ' '{print $3}') ; docker tag $image ${local.fn_image}"
32-
# working_dir = "${path.module}/${local.fn_working_dir}"
33-
#}
31+
provisioner "local-exec" {
32+
command = "image=$(docker images | grep ${var.functionname} | awk -F ' ' '{print $3}') ; docker tag $image ${local.fn_image}"
33+
working_dir = "${path.module}/${local.fn_working_dir}"
34+
}
3435

3536
provisioner "local-exec" {
36-
# command = "docker push ${local.fn_image}"
37-
command = "fn -v deploy --app ${var.functionname}"
37+
command = "docker manifestpush ${local.fn_image}"
3838
working_dir = "${path.module}/${local.fn_working_dir}"
3939
}
4040

security/security-design/shared-assets/fn-datasafe-dbaudit-to-oci-logging/files/terraform/locals.tf

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,5 @@ locals {
2828
alarm_displayname = "${var.alarmnameprefix}${local.resource_nc}"
2929
fn_working_dir = "function/${var.functionname}"
3030
fn_repository= "${local.ocir_docker_repository}/${local.namespace}/${oci_artifacts_container_repository.fn_container_repository.display_name}"
31-
fn_image = "${local.fn_repository}:0.0.1"
32-
fn_image_app = "${oci_artifacts_container_repository.fn_container_repository.display_name}:0.0.1"
31+
fn_image = "${local.fn_repository}:0.0.1-SNAPSHOT-X86-ARM"
3332
}

0 commit comments

Comments
 (0)