From 33d63db80e287ebba9ffde4add42c1cd673ac7ce Mon Sep 17 00:00:00 2001 From: Isaac Calligeros Date: Mon, 11 Mar 2024 22:34:37 +0000 Subject: [PATCH 1/3] Octopus Schema Migration to v7 --- .octopus/ubuntu.18.04/schema_version.ocl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.octopus/ubuntu.18.04/schema_version.ocl b/.octopus/ubuntu.18.04/schema_version.ocl index 4548a61..21771c8 100644 --- a/.octopus/ubuntu.18.04/schema_version.ocl +++ b/.octopus/ubuntu.18.04/schema_version.ocl @@ -1 +1 @@ -version = 6 \ No newline at end of file +version = 7 \ No newline at end of file From 6db97519565af10472f32bb943d20b3ea0a78862 Mon Sep 17 00:00:00 2001 From: Isaac Calligeros Date: Mon, 11 Mar 2024 22:34:37 +0000 Subject: [PATCH 2/3] Combined manifest is not working at this stage. --- .octopus/ubuntu.18.04/deployment_process.ocl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.octopus/ubuntu.18.04/deployment_process.ocl b/.octopus/ubuntu.18.04/deployment_process.ocl index a871494..2c4c146 100644 --- a/.octopus/ubuntu.18.04/deployment_process.ocl +++ b/.octopus/ubuntu.18.04/deployment_process.ocl @@ -8,7 +8,6 @@ step "push-docker-image" { DockerPush.Target.Docker.Registry.Password = "#{Docker.Registry.Target.Password}" DockerPush.Target.Docker.Registry.Username = "#{Docker.Registry.Target.Username}" DockerPush.Target.Docker.Repository = "#{Docker.Registry.Target.Repository}" - Octopus.Action.RunOnServer = "true" Octopus.Action.Template.Id = "ActionTemplates-2141" Octopus.Action.Template.Version = "11" } @@ -26,12 +25,12 @@ step "create-docker-manifest" { action { environments = ["staging", "production"] + is_disabled = true properties = { DockerPush.Target.Docker.Registry.Hostname = "#{Docker.Registry.Target.Hostname}" DockerPush.Target.Docker.Registry.Password = "#{Docker.Registry.Target.Password}" DockerPush.Target.Docker.Registry.Username = "#{Docker.Registry.Target.Username}" DockerPush.Target.Docker.Repository = "#{Docker.Registry.Target.Repository}" - Octopus.Action.RunOnServer = "true" Octopus.Action.Template.Id = "ActionTemplates-2741" Octopus.Action.Template.Version = "4" } From 7be2de73644aeb5be26cebdfd362dd328a6a83db Mon Sep 17 00:00:00 2001 From: isaac Date: Tue, 12 Mar 2024 13:04:36 +1030 Subject: [PATCH 3/3] Update Java JDK version --- ubuntu.22.04/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ubuntu.22.04/Dockerfile b/ubuntu.22.04/Dockerfile index e84da28..471d7b9 100644 --- a/ubuntu.22.04/Dockerfile +++ b/ubuntu.22.04/Dockerfile @@ -11,7 +11,7 @@ ARG Eks_Cli_Version=v0.156.0 ARG Google_Cloud_Cli_Version=445.0.0-0 ARG Google_Cloud_Gke_Cloud_Auth_Plugin_Version=412.0.0-0 ARG Helm_Version=v3.7.1 -ARG Java_Jdk_Version=11.0.21+9-0ubuntu1~22.04 +ARG Java_Jdk_Version=11.0.22+7-0ubuntu2~22.04.1 ARG Kubectl_Version=1.28.1-00 ARG Kubelogin_Version=v0.0.30 ARG Octopus_Cli_Version=1.7.1