Merge main into install-codeql-bundle.

This commit is contained in:
Chris Gavin
2020-09-23 12:39:57 +01:00
32 changed files with 358 additions and 228 deletions

View File

@@ -0,0 +1,16 @@
#!/bin/bash
################################################################################
## File: post-deployment.sh
## Desc: Post deployment actions
################################################################################
# set chmod -R 777 /opt
if [[ -d "/opt" ]]; then
echo "chmod -R 777 /opt"
chmod -R 777 /opt
fi
# remove installer and helper folders
rm -rf $HELPER_SCRIPT_FOLDER
rm -rf $INSTALLER_SCRIPT_FOLDER
chmod 755 $IMAGE_FOLDER

View File

@@ -304,10 +304,13 @@
},
{
"type": "shell",
"inline": [
"rm -rf {{user `helper_script_folder`}}",
"rm -rf {{user `installer_script_folder`}}",
"chmod 755 {{user `image_folder`}}"
"scripts":[
"{{template_dir}}/scripts/installers/post-deployment.sh"
],
"environment_vars":[
"HELPER_SCRIPT_FOLDER={{user `helper_script_folder`}}",
"INSTALLER_SCRIPT_FOLDER={{user `installer_script_folder`}}",
"IMAGE_FOLDER={{user `image_folder`}}"
],
"execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'"
},

View File

@@ -308,10 +308,13 @@
},
{
"type": "shell",
"inline": [
"rm -rf {{user `helper_script_folder`}}",
"rm -rf {{user `installer_script_folder`}}",
"chmod 755 {{user `image_folder`}}"
"scripts":[
"{{template_dir}}/scripts/installers/post-deployment.sh"
],
"environment_vars":[
"HELPER_SCRIPT_FOLDER={{user `helper_script_folder`}}",
"INSTALLER_SCRIPT_FOLDER={{user `installer_script_folder`}}",
"IMAGE_FOLDER={{user `image_folder`}}"
],
"execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'"
},

View File

@@ -308,6 +308,18 @@
"destination": "{{template_dir}}/Ubuntu2004-README.md",
"direction": "download"
},
{
"type": "shell",
"scripts":[
"{{template_dir}}/scripts/installers/post-deployment.sh"
],
"environment_vars":[
"HELPER_SCRIPT_FOLDER={{user `helper_script_folder`}}",
"INSTALLER_SCRIPT_FOLDER={{user `installer_script_folder`}}",
"IMAGE_FOLDER={{user `image_folder`}}"
],
"execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'"
},
{
"type": "shell",
"scripts":[
@@ -317,15 +329,6 @@
"RUN_VALIDATION={{user `run_validation_diskspace`}}"
]
},
{
"type": "shell",
"inline": [
"rm -rf {{user `helper_script_folder`}}",
"rm -rf {{user `installer_script_folder`}}",
"chmod 755 {{user `image_folder`}}"
],
"execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'"
},
{
"type": "file",
"source": "{{template_dir}}/config/ubuntu2004.conf",