Skip to content

Commit eaf65f6

Browse files
committed
Merge remote-tracking branch 'origin/main'
2 parents 2a4c247 + 9ec062c commit eaf65f6

File tree

1 file changed

+75
-68
lines changed

1 file changed

+75
-68
lines changed
Lines changed: 75 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -1,76 +1,83 @@
1-
step "deploy-with-cli" {
2-
name = "Deploy with CLI"
3-
4-
action {
5-
environments = ["production"]
6-
properties = {
7-
Octopus.Action.Template.Id = "ActionTemplates-4321"
8-
Octopus.Action.Template.Version = "7"
9-
Packages.FunctionApp = "{\"PackageId\":\"spacebuilder_azure\",\"FeedId\":\"octopus-server-built-in\"}"
10-
}
11-
worker_pool = "hosted-ubuntu"
12-
13-
container {
14-
feed = "docker-hub"
15-
image = "octopuslabs/azure-workertools"
16-
}
17-
18-
packages "Packages.FunctionApp" {
19-
acquisition_location = "Server"
20-
feed = "octopus-server-built-in"
21-
package_id = "spacebuilder_azure"
22-
properties = {
23-
Extract = "True"
24-
PackageParameterName = "Packages.FunctionApp"
25-
Purpose = ""
26-
SelectionMode = "deferred"
27-
}
28-
}
1+
process_template "predeploy-hook" {
2+
name = "PreDeploy Hook"
3+
process_template_slug = "project-predeploy-hook"
4+
version_mask = "1.X"
5+
6+
parameter "Octopus.WorkerPool" {
7+
value = "WorkerPools-2688"
298
}
309
}
3110

32-
step "remove-worker-access" {
33-
name = "Remove worker access"
34-
35-
action {
36-
environments = ["production"]
37-
properties = {
38-
Octopus.Action.Template.Id = "ActionTemplates-4322"
39-
Octopus.Action.Template.Version = "0"
40-
}
41-
worker_pool = "hosted-ubuntu"
42-
43-
container {
44-
feed = "docker-hub"
45-
image = "octopuslabs/azure-workertools"
46-
}
11+
process_template "deployment" {
12+
name = "Deployment"
13+
process_template_slug = "azure-function-deployment-go"
14+
version_mask = "2.X"
15+
16+
package_parameter "Packages.FunctionApp" {
17+
feed = "octopus-server-built-in"
18+
package_id = "spacebuilder_azure"
19+
}
20+
21+
package_parameter "Packages.FunctionsCli" {
22+
feed = "octopus-server-built-in"
23+
package_id = "Azure.Functions.Cli.linux-x64"
24+
}
25+
26+
parameter "Azure.Account" {
27+
value = "Octopus.Azure.Account"
28+
}
29+
30+
parameter "Octopus.WorkerPool" {
31+
value = "WorkerPools-2688"
32+
}
33+
34+
parameter "Octopus.ContainerImageFeed" {
35+
value = "Feeds-4704"
36+
}
37+
38+
parameter "Octopus.Environment.Security" {
39+
value = "Environments-3023"
4740
}
4841
}
4942

50-
step "scan-for-security-vulnerabilities" {
51-
name = "Scan for Security Vulnerabilities"
52-
53-
action {
54-
environments = ["security"]
55-
properties = {
56-
Octopus.Action.AutoRetry.MaximumCount = "3"
57-
Octopus.Action.RunOnServer = "true"
58-
Octopus.Action.Template.Id = "ActionTemplates-4361"
59-
Octopus.Action.Template.Version = "3"
60-
SecurityScan.Package = "{\"PackageId\":\"spacebuilder_azure\",\"FeedId\":\"octopus-server-built-in\"}"
61-
}
62-
worker_pool_variable = ""
63-
64-
packages "ApplicationPackage" {
65-
acquisition_location = "Server"
66-
feed = "octopus-server-built-in"
67-
package_id = "spacebuilder_azure"
68-
properties = {
69-
Extract = "True"
70-
PackageParameterName = "SecurityScan.Package"
71-
Purpose = ""
72-
SelectionMode = "deferred"
73-
}
74-
}
43+
process_template "security" {
44+
name = "Security"
45+
process_template_slug = "azure-function-deployment"
46+
version_mask = "4.X"
47+
48+
package_parameter "Packages.AzureCli" {
49+
feed = "octopus-server-built-in"
50+
package_id = "Azure.Functions.Cli.linux-x64"
51+
}
52+
53+
package_parameter "SecurityScan.Package" {
54+
feed = "octopus-server-built-in"
55+
package_id = "spacebuilder_azure"
56+
}
57+
58+
parameter "Azure.Account" {
59+
value = "Octopus.Azure.Account"
60+
}
61+
62+
parameter "Octopus.WorkerPool" {
63+
value = "WorkerPools-2688"
64+
}
65+
66+
parameter "Octopus.ContainerImageFeed" {
67+
value = "Feeds-4704"
68+
}
69+
70+
parameter "Octopus.SecurityEnvironment" {
71+
value = "Environments-3023"
72+
}
73+
}
74+
75+
process_template "postdeploy-hook" {
76+
name = "PostDeploy Hook"
77+
process_template_slug = "project-postdeploy-hook"
78+
version_mask = "1.X"
79+
80+
parameter "Octopus.WorkerPool" {
81+
value = "WorkerPools-2688"
7582
}
7683
}

0 commit comments

Comments
 (0)