From d4335cc52e0569b7e5ac9720b10ddbecaede0995 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov Date: Mon, 21 Sep 2020 11:18:28 +0300 Subject: [PATCH 1/2] set chmod -R 777 /opt --- .../scripts/installers/post-deployment.sh | 11 ++++++++ images/linux/ubuntu1604.json | 25 ++++++++++++------- images/linux/ubuntu1804.json | 25 ++++++++++++------- images/linux/ubuntu2004.json | 7 ++++++ 4 files changed, 50 insertions(+), 18 deletions(-) create mode 100644 images/linux/scripts/installers/post-deployment.sh diff --git a/images/linux/scripts/installers/post-deployment.sh b/images/linux/scripts/installers/post-deployment.sh new file mode 100644 index 00000000..10fe34fe --- /dev/null +++ b/images/linux/scripts/installers/post-deployment.sh @@ -0,0 +1,11 @@ +#!/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 diff --git a/images/linux/ubuntu1604.json b/images/linux/ubuntu1604.json index 33263345..111f87f0 100644 --- a/images/linux/ubuntu1604.json +++ b/images/linux/ubuntu1604.json @@ -301,15 +301,6 @@ "destination": "{{template_dir}}/Ubuntu1604-README.md", "direction": "download" }, - { - "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": "shell", "scripts":[ @@ -319,6 +310,22 @@ "RUN_VALIDATION={{user `run_validation_diskspace`}}" ] }, + { + "type": "shell", + "scripts":[ + "{{template_dir}}/scripts/installers/post-deployment.sh" + ], + "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" + }, + { + "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/ubuntu1604.conf", diff --git a/images/linux/ubuntu1804.json b/images/linux/ubuntu1804.json index 1dd62bc2..d62de1e4 100644 --- a/images/linux/ubuntu1804.json +++ b/images/linux/ubuntu1804.json @@ -305,15 +305,6 @@ "destination": "{{template_dir}}/Ubuntu1804-README.md", "direction": "download" }, - { - "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": "shell", "scripts":[ @@ -323,6 +314,22 @@ "RUN_VALIDATION={{user `run_validation_diskspace`}}" ] }, + { + "type": "shell", + "scripts":[ + "{{template_dir}}/scripts/installers/post-deployment.sh" + ], + "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" + }, + { + "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/ubuntu1804.conf", diff --git a/images/linux/ubuntu2004.json b/images/linux/ubuntu2004.json index 67d6e1d6..5a0f7760 100644 --- a/images/linux/ubuntu2004.json +++ b/images/linux/ubuntu2004.json @@ -316,6 +316,13 @@ "RUN_VALIDATION={{user `run_validation_diskspace`}}" ] }, + { + "type": "shell", + "scripts":[ + "{{template_dir}}/scripts/installers/post-deployment.sh" + ], + "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" + }, { "type": "shell", "inline": [ From fe9f74e51ed37a716f61a7e9de6286bf57ef55c8 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov Date: Tue, 22 Sep 2020 13:55:21 +0300 Subject: [PATCH 2/2] rm helper and installer folder in post-deployment --- .../scripts/installers/post-deployment.sh | 5 ++++ images/linux/ubuntu1604.json | 28 ++++++++----------- images/linux/ubuntu1804.json | 28 ++++++++----------- images/linux/ubuntu2004.json | 28 ++++++++----------- 4 files changed, 41 insertions(+), 48 deletions(-) diff --git a/images/linux/scripts/installers/post-deployment.sh b/images/linux/scripts/installers/post-deployment.sh index 10fe34fe..2864dae4 100644 --- a/images/linux/scripts/installers/post-deployment.sh +++ b/images/linux/scripts/installers/post-deployment.sh @@ -9,3 +9,8 @@ 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 diff --git a/images/linux/ubuntu1604.json b/images/linux/ubuntu1604.json index 111f87f0..3aa477cb 100644 --- a/images/linux/ubuntu1604.json +++ b/images/linux/ubuntu1604.json @@ -301,6 +301,18 @@ "destination": "{{template_dir}}/Ubuntu1604-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":[ @@ -310,22 +322,6 @@ "RUN_VALIDATION={{user `run_validation_diskspace`}}" ] }, - { - "type": "shell", - "scripts":[ - "{{template_dir}}/scripts/installers/post-deployment.sh" - ], - "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" - }, - { - "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/ubuntu1604.conf", diff --git a/images/linux/ubuntu1804.json b/images/linux/ubuntu1804.json index d62de1e4..a5b71c07 100644 --- a/images/linux/ubuntu1804.json +++ b/images/linux/ubuntu1804.json @@ -305,6 +305,18 @@ "destination": "{{template_dir}}/Ubuntu1804-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":[ @@ -314,22 +326,6 @@ "RUN_VALIDATION={{user `run_validation_diskspace`}}" ] }, - { - "type": "shell", - "scripts":[ - "{{template_dir}}/scripts/installers/post-deployment.sh" - ], - "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" - }, - { - "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/ubuntu1804.conf", diff --git a/images/linux/ubuntu2004.json b/images/linux/ubuntu2004.json index 5a0f7760..c2a1bd56 100644 --- a/images/linux/ubuntu2004.json +++ b/images/linux/ubuntu2004.json @@ -307,6 +307,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":[ @@ -316,22 +328,6 @@ "RUN_VALIDATION={{user `run_validation_diskspace`}}" ] }, - { - "type": "shell", - "scripts":[ - "{{template_dir}}/scripts/installers/post-deployment.sh" - ], - "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" - }, - { - "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",