tMerge branch 'main' of https://github.com/oracle-quickstart/oci-weblogic-server into main

Sarada Kommalapati · Sarada Kommalapati · commit c3c50a6f632c · 2024-07-22T15:00:36.000-05:00
diff --git a/terraform/images/mp_image_ee_byol.tfvars b/terraform/images/mp_image_ee_byol.tfvars
@@ -1,12 +1,12 @@
 # Copyright (c) 2023,2024, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
 
-tf_script_version        = "24.2.3-240707011339"
+tf_script_version        = "24.3.1-240717203601"
 use_marketplace_image    = true
 listing_id               = "ocid1.appcataloglisting.oc1..aaaaaaaawd5ti5ldjzdppppi675onvo3mvjcwt64jjey7rib3beau2ngkl2q"
-listing_resource_version = "24.2.3-ol8.8-23.12.13-240707-1"
-instance_image_id        = "ocid1.image.oc1..aaaaaaaasq3vlogcg2t7oisib2mabio6vdxdp5d4jwu5r4gauwmyomfolekq"
+listing_resource_version = "24.3.1-ol8.8-23.12.13-240717-1"
+instance_image_id        = "ocid1.image.oc1..aaaaaaaauga63jzbyefbqtjeboszo27r4afg7j4axp4cif5in6azshnlc6yq"
 
 ucm_listing_id               = "ocid1.appcataloglisting.oc1..aaaaaaaa653zc2e4fsem5hhwinmfgnv3xp4dmbq6c6gvf45okxf6xz3smhiq"
-ucm_listing_resource_version = "24.2.3-ol8.8-23.12.13-240707-1"
-ucm_instance_image_id        = "ocid1.image.oc1..aaaaaaaa63nrqjyfkdg3jz4tlznzfhp6fijw3tpr46bfkw62sbmjbtbgqxsq"
+ucm_listing_resource_version = "24.3.1-ol8.8-23.12.13-240717-1"
+ucm_instance_image_id        = "ocid1.image.oc1..aaaaaaaaelqj7qwwrggbhlfxzpa4qhmojpnhcycwml2e2lwsksmov3dh77hq"
diff --git a/terraform/images/mp_image_ee_ucm.tfvars b/terraform/images/mp_image_ee_ucm.tfvars
@@ -1,8 +1,8 @@
 # Copyright (c) 2023,2024, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
 
-tf_script_version        = "24.2.3-240707011339"
+tf_script_version        = "24.3.1-240717203601"
 use_marketplace_image    = true
 listing_id               = "ocid1.appcataloglisting.oc1..aaaaaaaa653zc2e4fsem5hhwinmfgnv3xp4dmbq6c6gvf45okxf6xz3smhiq"
-listing_resource_version = "24.2.3-ol8.8-23.12.13-240707-1"
-instance_image_id        = "ocid1.image.oc1..aaaaaaaa63nrqjyfkdg3jz4tlznzfhp6fijw3tpr46bfkw62sbmjbtbgqxsq"
+listing_resource_version = "24.3.1-ol8.8-23.12.13-240717-1"
+instance_image_id        = "ocid1.image.oc1..aaaaaaaaelqj7qwwrggbhlfxzpa4qhmojpnhcycwml2e2lwsksmov3dh77hq"
diff --git a/terraform/images/mp_image_se_byol.tfvars b/terraform/images/mp_image_se_byol.tfvars
@@ -1,8 +1,8 @@
 # Copyright (c) 2023,2024, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
 
-tf_script_version        = "24.2.3-240707011339"
+tf_script_version        = "24.3.1-240717203601"
 use_marketplace_image    = true
 listing_id               = "ocid1.appcataloglisting.oc1..aaaaaaaaalcwal6mfwjbezzqyj3waoxrvigml4n3lcn3hfday3ozetjqn25a"
-listing_resource_version = "24.2.3-ol8.8-23.12.13-240707-1"
-instance_image_id        = "ocid1.image.oc1..aaaaaaaanmermunglaaloxxegvf7s4c6kzw3zkmcsiohofkwdibwboaemfaq"
+listing_resource_version = "24.3.1-ol8.8-23.12.13-240717-1"
+instance_image_id        = "ocid1.image.oc1..aaaaaaaasy6a25lbasdgoosem52sgtsxcd3ma7b7xfiuvq3jzryecoc4bhiq"
diff --git a/terraform/images/mp_image_suite_byol.tfvars b/terraform/images/mp_image_suite_byol.tfvars
@@ -1,12 +1,12 @@
 # Copyright (c) 2023,2024, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
 
-tf_script_version        = "24.2.3-240707011339"
+tf_script_version        = "24.3.1-240717203601"
 use_marketplace_image    = true
 listing_id               = "ocid1.appcataloglisting.oc1..aaaaaaaajl5w3d76x5vdc4n7oqjpsxh4jtwivclvvp6gj4em3kufju6sftga"
-listing_resource_version = "24.2.3-ol8.8-23.12.13-240707-1"
-instance_image_id        = "ocid1.image.oc1..aaaaaaaaszrageu5qmeokprhmah7uawrzryx2gwovieayznk4rs2na6ibbgq"
+listing_resource_version = "24.3.1-ol8.8-23.12.13-240717-1"
+instance_image_id        = "ocid1.image.oc1..aaaaaaaaqe6spyz6djfxr37asosv2sxgsdanvft3py444szbrpffr74vvb5a"
 
 ucm_listing_id               = "ocid1.appcataloglisting.oc1..aaaaaaaaq2vkow7zwkxg6ky4zxsnckdlfgtgmg7i4kkyev3y6zyo72mpkgza"
-ucm_listing_resource_version = "24.2.3-ol8.8-23.12.13-240707-1"
-ucm_instance_image_id        = "ocid1.image.oc1..aaaaaaaahgwa3lpwiqrxlsue7dymzh3yblajmdpsylrlzxsiff2oln3ychgq"
+ucm_listing_resource_version = "24.3.1-ol8.8-23.12.13-240717-1"
+ucm_instance_image_id        = "ocid1.image.oc1..aaaaaaaa72qjwyo4nzhddmi6bs62mj22zc3jk6enflqpav3bfh2ll4gongja"
diff --git a/terraform/images/mp_image_suite_ucm.tfvars b/terraform/images/mp_image_suite_ucm.tfvars
@@ -1,8 +1,8 @@
 # Copyright (c) 2023,2024, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
 
-tf_script_version        = "24.2.3-240707011339"
+tf_script_version        = "24.3.1-240717203601"
 use_marketplace_image    = true
 listing_id               = "ocid1.appcataloglisting.oc1..aaaaaaaaq2vkow7zwkxg6ky4zxsnckdlfgtgmg7i4kkyev3y6zyo72mpkgza"
-listing_resource_version = "24.2.3-ol8.8-23.12.13-240707-1"
-instance_image_id        = "ocid1.image.oc1..aaaaaaaahgwa3lpwiqrxlsue7dymzh3yblajmdpsylrlzxsiff2oln3ychgq"
+listing_resource_version = "24.3.1-ol8.8-23.12.13-240717-1"
+instance_image_id        = "ocid1.image.oc1..aaaaaaaa72qjwyo4nzhddmi6bs62mj22zc3jk6enflqpav3bfh2ll4gongja"
diff --git a/terraform/modules/compute/wls_compute/idcs_variables.tf b/terraform/modules/compute/wls_compute/idcs_variables.tf
@@ -74,19 +74,19 @@ variable "idcs_cloudgate_config_file" {
 variable "idcs_cloudgate_docker_image_tar" {
   type        = string
   description = "Path of the binary file with the container image to run IDCS cloudgate container in the WebLogic VM"
-  default     = "/u01/zips/jcs/app_gateway_docker/21.2.2/app-gateway-docker-image.tar.gz"
+  default     = "/u01/zips/jcs/app_gateway_docker/23.4.44/app-gateway-docker-image.tar.gz"
 }
 
 variable "idcs_cloudgate_docker_image_version" {
   type        = string
   description = "Version of the container image to run IDCS cloudgate container in the WebLogic VM"
-  default     = "21.2.2-2105050509"
+  default     = "23.4.44-2310291619"
 }
 
 variable "idcs_cloudgate_docker_image_name" {
   type        = string
   description = "Name of the container image to run IDCS cloudgate container in the WebLogic VM"
-  default     = "idcs/idcs-appgateway"
+  default     = "idcs-appgateway-docker"
 }
 
 variable "lbip" {
