зеркало из https://github.com/Azure/ARO-RP.git
Revert docker to podman migration changes
This commit is contained in:
bennerv
Родитель
9f3d7b5463
Коммит
8b11c9c918
|
|
@ -222,7 +222,7 @@
|
|||
"autoUpgradeMinorVersion": true,
|
||||
"settings": {},
|
||||
"protectedSettings": {
|
||||
"script": "[base64(concat(base64ToString('c2V0IC1lCgo='),'CIAZPTOKEN=''',parameters('ciAzpToken'),'''\n','CIPOOLNAME=''',parameters('ciPoolName'),'''\n','\n',base64ToString('Cnl1bSAteSB1cGRhdGUgLXggV0FMaW51eEFnZW50CgpsdmV4dGVuZCAtbCArNTAlRlJFRSAvZGV2L3Jvb3R2Zy92YXJsdgp4ZnNfZ3Jvd2ZzIC92YXIKCmx2ZXh0ZW5kIC1sICsxMDAlRlJFRSAvZGV2L3Jvb3R2Zy9ob21lbHYKeGZzX2dyb3dmcyAvaG9tZQoKcnBtIC0taW1wb3J0IGh0dHBzOi8vZGwuZmVkb3JhcHJvamVjdC5vcmcvcHViL2VwZWwvUlBNLUdQRy1LRVktRVBFTC03CnJwbSAtLWltcG9ydCBodHRwczovL3BhY2thZ2VzLm1pY3Jvc29mdC5jb20va2V5cy9taWNyb3NvZnQuYXNjCgp5dW0gLXkgaW5zdGFsbCBodHRwczovL2RsLmZlZG9yYXByb2plY3Qub3JnL3B1Yi9lcGVsL2VwZWwtcmVsZWFzZS1sYXRlc3QtNy5ub2FyY2gucnBtCgpjYXQgPi9ldGMveXVtLnJlcG9zLmQvYXp1cmUucmVwbyA8PCdFT0YnClthenVyZS1jbGldCm5hbWU9YXp1cmUtY2xpCmJhc2V1cmw9aHR0cHM6Ly9wYWNrYWdlcy5taWNyb3NvZnQuY29tL3l1bXJlcG9zL2F6dXJlLWNsaQplbmFibGVkPXllcwpncGdjaGVjaz15ZXMKRU9GCgp5dW0gLS1lbmFibGVyZXBvPXJodWktcmhlbC03LXNlcnZlci1yaHVpLW9wdGlvbmFsLXJwbXMgLS1lbmFibGVyZXBvPXJodWktcmhlbC03LXNlcnZlci1yaHVpLWV4dHJhcy1ycG1zIC15IGluc3RhbGwgYXp1cmUtY2xpIHBvZG1hbiBwb2RtYW4tZG9ja2VyIGpxIGxpYmFzc3Vhbi1kZXZlbCBnY2MgZ3BnbWUtZGV2ZWwgcmgtZ2l0MjkgcmgtcHl0aG9uMzYgdG1wd2F0Y2gKCkdPX1ZFUlNJT049MS4xNC45CmN1cmwgaHR0cHM6Ly9kbC5nb29nbGUuY29tL2dvL2dvJHtHT19WRVJTSU9OfS5saW51eC1hbWQ2NC50YXIuZ3ogfCB0YXIgLUMgL3Vzci9sb2NhbCAteHoKbG4gLXMgL3Vzci9sb2NhbC9nby9iaW4vKiAvdXNyL2xvY2FsL2JpbgoKVlNUU19BR0VOVF9WRVJTSU9OPTIuMTgxLjEKbWtkaXIgL2hvbWUvY2xvdWQtdXNlci9hZ2VudApwdXNoZCAvaG9tZS9jbG91ZC11c2VyL2FnZW50CmN1cmwgaHR0cHM6Ly92c3RzYWdlbnRwYWNrYWdlLmF6dXJlZWRnZS5uZXQvYWdlbnQvJHtWU1RTX0FHRU5UX1ZFUlNJT059L3ZzdHMtYWdlbnQtbGludXgteDY0LSR7VlNUU19BR0VOVF9WRVJTSU9OfS50YXIuZ3ogfCB0YXIgLXh6CmNob3duIC1SIGNsb3VkLXVzZXI6Y2xvdWQtdXNlciAuCgouL2Jpbi9pbnN0YWxsZGVwZW5kZW5jaWVzLnNoCnN1ZG8gLXUgY2xvdWQtdXNlciAuL2NvbmZpZy5zaCAtLXVuYXR0ZW5kZWQgLS11cmwgaHR0cHM6Ly9kZXYuYXp1cmUuY29tL21zYXp1cmUgLS1hdXRoIHBhdCAtLXRva2VuICIkQ0lBWlBUT0tFTiIgLS1wb29sICIkQ0lQT09MTkFNRSIgLS1hZ2VudCAiQVJPLVJIRUwtJEhPU1ROQU1FIiAtLXJlcGxhY2UKLi9zdmMuc2ggaW5zdGFsbCBjbG91ZC11c2VyCnBvcGQKCiMgbWVyZ2UgaW4gL29wdC9yaC9yaC0qL2VuYWJsZQpjYXQgPi9ob21lL2Nsb3VkLXVzZXIvYWdlbnQvLnBhdGggPDwnRU9GJwovb3B0L3JoL3JoLXB5dGhvbjM2L3Jvb3QvdXNyL2Jpbjovb3B0L3JoL3JoLWdpdDI5L3Jvb3QvdXNyL2JpbjovdXNyL2xvY2FsL2JpbjovdXNyL2JpbjovdXNyL2xvY2FsL3NiaW46L3Vzci9zYmluOi9ob21lL2Nsb3VkLXVzZXIvLmxvY2FsL2JpbjovaG9tZS9jbG91ZC11c2VyL2JpbgpFT0YKCmNhdCA+L2hvbWUvY2xvdWQtdXNlci9hZ2VudC8uZW52IDw8J0VPRicKTERfTElCUkFSWV9QQVRIPS9vcHQvcmgvcmgtcHl0aG9uMzYvcm9vdC91c3IvbGliNjQ6L29wdC9yaC9odHRwZDI0L3Jvb3QvdXNyL2xpYjY0Ck1BTlBBVEg9L29wdC9yaC9yaC1weXRob24zNi9yb290L3Vzci9zaGFyZS9tYW46L29wdC9yaC9yaC1naXQyOS9yb290L3Vzci9zaGFyZS9tYW4KUEVSTDVMSUI9L29wdC9yaC9yaC1naXQyOS9yb290L3Vzci9zaGFyZS9wZXJsNS92ZW5kb3JfcGVybApQS0dfQ09ORklHX1BBVEg9L29wdC9yaC9yaC1weXRob24zNi9yb290L3Vzci9saWI2NC9wa2djb25maWcKWERHX0RBVEFfRElSUz0vb3B0L3JoL3JoLXB5dGhvbjM2L3Jvb3QvdXNyL3NoYXJlOi91c3IvbG9jYWwvc2hhcmU6L3Vzci9zaGFyZQpFT0YKCmNhdCA+L2V0Yy9jcm9uLmhvdXJseS90bXB3YXRjaCA8PCdFT0YnCiMhL2Jpbi9iYXNoCgpleGVjIC9zYmluL3RtcHdhdGNoIDI0aCAvdG1wCkVPRgpjaG1vZCAreCAvZXRjL2Nyb24uaG91cmx5L3RtcHdhdGNoCgooc2xlZXAgMzA7IHJlYm9vdCkgJgo=')))]"
|
||||
"script": "[base64(concat(base64ToString('c2V0IC1lCgo='),'CIAZPTOKEN=''',parameters('ciAzpToken'),'''\n','CIPOOLNAME=''',parameters('ciPoolName'),'''\n','\n',base64ToString('Cnl1bSAteSB1cGRhdGUgLXggV0FMaW51eEFnZW50CgpsdmV4dGVuZCAtbCArNTAlRlJFRSAvZGV2L3Jvb3R2Zy92YXJsdgp4ZnNfZ3Jvd2ZzIC92YXIKCmx2ZXh0ZW5kIC1sICsxMDAlRlJFRSAvZGV2L3Jvb3R2Zy9ob21lbHYKeGZzX2dyb3dmcyAvaG9tZQoKcnBtIC0taW1wb3J0IGh0dHBzOi8vZGwuZmVkb3JhcHJvamVjdC5vcmcvcHViL2VwZWwvUlBNLUdQRy1LRVktRVBFTC03CnJwbSAtLWltcG9ydCBodHRwczovL3BhY2thZ2VzLm1pY3Jvc29mdC5jb20va2V5cy9taWNyb3NvZnQuYXNjCgp5dW0gLXkgaW5zdGFsbCBodHRwczovL2RsLmZlZG9yYXByb2plY3Qub3JnL3B1Yi9lcGVsL2VwZWwtcmVsZWFzZS1sYXRlc3QtNy5ub2FyY2gucnBtCgpjYXQgPi9ldGMveXVtLnJlcG9zLmQvYXp1cmUucmVwbyA8PCdFT0YnClthenVyZS1jbGldCm5hbWU9YXp1cmUtY2xpCmJhc2V1cmw9aHR0cHM6Ly9wYWNrYWdlcy5taWNyb3NvZnQuY29tL3l1bXJlcG9zL2F6dXJlLWNsaQplbmFibGVkPXllcwpncGdjaGVjaz15ZXMKRU9GCgp5dW0gLS1lbmFibGVyZXBvPXJodWktcmhlbC03LXNlcnZlci1yaHVpLW9wdGlvbmFsLXJwbXMgLXkgaW5zdGFsbCBhenVyZS1jbGkgZG9ja2VyIGpxIGxpYmFzc3Vhbi1kZXZlbCBnY2MgZ3BnbWUtZGV2ZWwgcmgtZ2l0MjkgcmgtcHl0aG9uMzYgdG1wd2F0Y2gKCkdPX1ZFUlNJT049MS4xNC45CmN1cmwgaHR0cHM6Ly9kbC5nb29nbGUuY29tL2dvL2dvJHtHT19WRVJTSU9OfS5saW51eC1hbWQ2NC50YXIuZ3ogfCB0YXIgLUMgL3Vzci9sb2NhbCAteHoKbG4gLXMgL3Vzci9sb2NhbC9nby9iaW4vKiAvdXNyL2xvY2FsL2JpbgoKVlNUU19BR0VOVF9WRVJTSU9OPTIuMTgxLjEKbWtkaXIgL2hvbWUvY2xvdWQtdXNlci9hZ2VudApwdXNoZCAvaG9tZS9jbG91ZC11c2VyL2FnZW50CmN1cmwgaHR0cHM6Ly92c3RzYWdlbnRwYWNrYWdlLmF6dXJlZWRnZS5uZXQvYWdlbnQvJHtWU1RTX0FHRU5UX1ZFUlNJT059L3ZzdHMtYWdlbnQtbGludXgteDY0LSR7VlNUU19BR0VOVF9WRVJTSU9OfS50YXIuZ3ogfCB0YXIgLXh6CmNob3duIC1SIGNsb3VkLXVzZXI6Y2xvdWQtdXNlciAuCgouL2Jpbi9pbnN0YWxsZGVwZW5kZW5jaWVzLnNoCnN1ZG8gLXUgY2xvdWQtdXNlciAuL2NvbmZpZy5zaCAtLXVuYXR0ZW5kZWQgLS11cmwgaHR0cHM6Ly9kZXYuYXp1cmUuY29tL21zYXp1cmUgLS1hdXRoIHBhdCAtLXRva2VuICIkQ0lBWlBUT0tFTiIgLS1wb29sICIkQ0lQT09MTkFNRSIgLS1hZ2VudCAiQVJPLVJIRUwtJEhPU1ROQU1FIiAtLXJlcGxhY2UKLi9zdmMuc2ggaW5zdGFsbCBjbG91ZC11c2VyCnBvcGQKCiMgbWVyZ2UgaW4gL29wdC9yaC9yaC0qL2VuYWJsZQpjYXQgPi9ob21lL2Nsb3VkLXVzZXIvYWdlbnQvLnBhdGggPDwnRU9GJwovb3B0L3JoL3JoLXB5dGhvbjM2L3Jvb3QvdXNyL2Jpbjovb3B0L3JoL3JoLWdpdDI5L3Jvb3QvdXNyL2JpbjovdXNyL2xvY2FsL2JpbjovdXNyL2JpbjovdXNyL2xvY2FsL3NiaW46L3Vzci9zYmluOi9ob21lL2Nsb3VkLXVzZXIvLmxvY2FsL2JpbjovaG9tZS9jbG91ZC11c2VyL2JpbgpFT0YKCmNhdCA+L2hvbWUvY2xvdWQtdXNlci9hZ2VudC8uZW52IDw8J0VPRicKTERfTElCUkFSWV9QQVRIPS9vcHQvcmgvcmgtcHl0aG9uMzYvcm9vdC91c3IvbGliNjQ6L29wdC9yaC9odHRwZDI0L3Jvb3QvdXNyL2xpYjY0Ck1BTlBBVEg9L29wdC9yaC9yaC1weXRob24zNi9yb290L3Vzci9zaGFyZS9tYW46L29wdC9yaC9yaC1naXQyOS9yb290L3Vzci9zaGFyZS9tYW4KUEVSTDVMSUI9L29wdC9yaC9yaC1naXQyOS9yb290L3Vzci9zaGFyZS9wZXJsNS92ZW5kb3JfcGVybApQS0dfQ09ORklHX1BBVEg9L29wdC9yaC9yaC1weXRob24zNi9yb290L3Vzci9saWI2NC9wa2djb25maWcKWERHX0RBVEFfRElSUz0vb3B0L3JoL3JoLXB5dGhvbjM2L3Jvb3QvdXNyL3NoYXJlOi91c3IvbG9jYWwvc2hhcmU6L3Vzci9zaGFyZQpFT0YKCnNlZCAtaSAtZSAncy9eT1BUSU9OUz0nXCcnL09QVElPTlM9J1wnJy1HIGNsb3VkLXVzZXIgLycgL2V0Yy9zeXNjb25maWcvZG9ja2VyCgpzeXN0ZW1jdGwgZW5hYmxlIGRvY2tlcgoKY2F0ID4vZXRjL2Nyb24uaG91cmx5L3RtcHdhdGNoIDw8J0VPRicKIyEvYmluL2Jhc2gKCmV4ZWMgL3NiaW4vdG1wd2F0Y2ggMjRoIC90bXAKRU9GCmNobW9kICt4IC9ldGMvY3Jvbi5ob3VybHkvdG1wd2F0Y2gKCihzbGVlcCAzMDsgcmVib290KSAmCg==')))]"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -320,7 +320,7 @@
|
|||
"autoUpgradeMinorVersion": true,
|
||||
"settings": {},
|
||||
"protectedSettings": {
|
||||
"script": "[base64(concat(base64ToString('c2V0IC1leAoK'),'PROXYIMAGE=$(base64 -d \u003c\u003c\u003c''',base64(parameters('proxyImage')),''')\n','PROXYIMAGEAUTH=$(base64 -d \u003c\u003c\u003c''',base64(parameters('proxyImageAuth')),''')\n','PROXYCERT=''',parameters('proxyCert'),'''\n','PROXYCLIENTCERT=''',parameters('proxyClientCert'),'''\n','PROXYKEY=''',parameters('proxyKey'),'''\n','\n',base64ToString('eXVtIC15IHVwZGF0ZSAteCBXQUxpbnV4QWdlbnQKeXVtIC15IGluc3RhbGwgcG9kbWFuIHBvZG1hbi1kb2NrZXIgLS1lbmFibGVyZXBvIHJodWktcmhlbC03LXNlcnZlci1yaHVpLWV4dHJhcy1ycG1zCgojIGh0dHBzOi8vYWNjZXNzLnJlZGhhdC5jb20vZG9jdW1lbnRhdGlvbi9lbi11cy9yZWRfaGF0X2VudGVycHJpc2VfbGludXhfYXRvbWljX2hvc3QvNy9odG1sL21hbmFnaW5nX2NvbnRhaW5lcnMvcnVubmluZ19jb250YWluZXJzX2FzX3N5c3RlbWRfc2VydmljZXNfd2l0aF9wb2RtYW4KIyBOZWVkIHRvIHNldCB0aGlzIGlmIFNFTGludXggaXMgZW5hYmxlZApzZXRzZWJvb2wgLVAgY29udGFpbmVyX21hbmFnZV9jZ3JvdXAgb24KCgpmaXJld2FsbC1jbWQgLS1hZGQtcG9ydD00NDMvdGNwIC0tcGVybWFuZW50Cgpta2RpciAvcm9vdC8uZG9ja2VyCmNhdCA+L3Jvb3QvLmRvY2tlci9jb25maWcuanNvbiA8PEVPRgp7CgkiYXV0aHMiOiB7CgkJIiR7UFJPWFlJTUFHRSUlLyp9IjogewoJCQkiYXV0aCI6ICIkUFJPWFlJTUFHRUFVVEgiCgkJfQoJfQp9CkVPRgpkb2NrZXIgcHVsbCAiJFBST1hZSU1BR0UiCgpta2RpciAvZXRjL3Byb3h5CmJhc2U2NCAtZCA8PDwiJFBST1hZQ0VSVCIgPi9ldGMvcHJveHkvcHJveHkuY3J0CmJhc2U2NCAtZCA8PDwiJFBST1hZS0VZIiA+L2V0Yy9wcm94eS9wcm94eS5rZXkKYmFzZTY0IC1kIDw8PCIkUFJPWFlDTElFTlRDRVJUIiA+L2V0Yy9wcm94eS9wcm94eS1jbGllbnQuY3J0CmNob3duIC1SIDEwMDA6MTAwMCAvZXRjL3Byb3h5CmNobW9kIDA2MDAgL2V0Yy9wcm94eS9wcm94eS5rZXkKCmNhdCA+L2V0Yy9zeXNjb25maWcvcHJveHkgPDxFT0YKUFJPWFlfSU1BR0U9JyRQUk9YWUlNQUdFJwpFT0YKCmNhdCA+L2V0Yy9zeXN0ZW1kL3N5c3RlbS9wcm94eS5zZXJ2aWNlIDw8J0VPRicKW1VuaXRdCkRlc2NyaXB0aW9uPVByb3h5IGNvbnRhaW5lcgoKW1NlcnZpY2VdCkVudmlyb25tZW50RmlsZT0vZXRjL3N5c2NvbmZpZy9wcm94eQpFeGVjU3RhcnRQcmU9LS91c3IvYmluL2RvY2tlciBybSAtZiAlbgpFeGVjU3RhcnQ9L3Vzci9iaW4vZG9ja2VyIHJ1biAtLXJtIC0tbmFtZSAlbiAtcCA0NDM6ODQ0MyAtdiAvZXRjL3Byb3h5Oi9zZWNyZXRzICRQUk9YWV9JTUFHRQpFeGVjU3RvcD0vdXNyL2Jpbi9kb2NrZXIgc3RvcCAlbgpSZXN0YXJ0PWFsd2F5cwpSZXN0YXJ0U2VjPTEKU3RhcnRMaW1pdEludGVydmFsPTAKCltJbnN0YWxsXQpXYW50ZWRCeT1tdWx0aS11c2VyLnRhcmdldApFT0YKCnN5c3RlbWN0bCBlbmFibGUgcHJveHkuc2VydmljZQoKKHNsZWVwIDMwOyByZWJvb3QpICYK')))]"
|
||||
"script": "[base64(concat(base64ToString('c2V0IC1leAoK'),'PROXYIMAGE=$(base64 -d \u003c\u003c\u003c''',base64(parameters('proxyImage')),''')\n','PROXYIMAGEAUTH=$(base64 -d \u003c\u003c\u003c''',base64(parameters('proxyImageAuth')),''')\n','PROXYCERT=''',parameters('proxyCert'),'''\n','PROXYCLIENTCERT=''',parameters('proxyClientCert'),'''\n','PROXYKEY=''',parameters('proxyKey'),'''\n','\n',base64ToString('eXVtIC15IHVwZGF0ZSAteCBXQUxpbnV4QWdlbnQKeXVtIC15IGluc3RhbGwgZG9ja2VyCgpmaXJld2FsbC1jbWQgLS1hZGQtcG9ydD00NDMvdGNwIC0tcGVybWFuZW50Cgpta2RpciAvcm9vdC8uZG9ja2VyCmNhdCA+L3Jvb3QvLmRvY2tlci9jb25maWcuanNvbiA8PEVPRgp7CgkiYXV0aHMiOiB7CgkJIiR7UFJPWFlJTUFHRSUlLyp9IjogewoJCQkiYXV0aCI6ICIkUFJPWFlJTUFHRUFVVEgiCgkJfQoJfQp9CkVPRgpzeXN0ZW1jdGwgc3RhcnQgZG9ja2VyLnNlcnZpY2UKZG9ja2VyIHB1bGwgIiRQUk9YWUlNQUdFIgoKbWtkaXIgL2V0Yy9wcm94eQpiYXNlNjQgLWQgPDw8IiRQUk9YWUNFUlQiID4vZXRjL3Byb3h5L3Byb3h5LmNydApiYXNlNjQgLWQgPDw8IiRQUk9YWUtFWSIgPi9ldGMvcHJveHkvcHJveHkua2V5CmJhc2U2NCAtZCA8PDwiJFBST1hZQ0xJRU5UQ0VSVCIgPi9ldGMvcHJveHkvcHJveHktY2xpZW50LmNydApjaG93biAtUiAxMDAwOjEwMDAgL2V0Yy9wcm94eQpjaG1vZCAwNjAwIC9ldGMvcHJveHkvcHJveHkua2V5CgpjYXQgPi9ldGMvc3lzY29uZmlnL3Byb3h5IDw8RU9GClBST1hZX0lNQUdFPSckUFJPWFlJTUFHRScKRU9GCgpjYXQgPi9ldGMvc3lzdGVtZC9zeXN0ZW0vcHJveHkuc2VydmljZSA8PCdFT0YnCltVbml0XQpBZnRlcj1kb2NrZXIuc2VydmljZQpSZXF1aXJlcz1kb2NrZXIuc2VydmljZQoKW1NlcnZpY2VdCkVudmlyb25tZW50RmlsZT0vZXRjL3N5c2NvbmZpZy9wcm94eQpFeGVjU3RhcnRQcmU9LS91c3IvYmluL2RvY2tlciBybSAtZiAlbgpFeGVjU3RhcnQ9L3Vzci9iaW4vZG9ja2VyIHJ1biAtLXJtIC0tbmFtZSAlbiAtcCA0NDM6ODQ0MyAtdiAvZXRjL3Byb3h5Oi9zZWNyZXRzICRQUk9YWV9JTUFHRQpFeGVjU3RvcD0vdXNyL2Jpbi9kb2NrZXIgc3RvcCAlbgpSZXN0YXJ0PWFsd2F5cwpSZXN0YXJ0U2VjPTEKU3RhcnRMaW1pdEludGVydmFsPTAKCltJbnN0YWxsXQpXYW50ZWRCeT1tdWx0aS11c2VyLnRhcmdldApFT0YKCnN5c3RlbWN0bCBlbmFibGUgcHJveHkuc2VydmljZQoKKHNsZWVwIDMwOyByZWJvb3QpICYK')))]"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Различия файлов скрыты, потому что одна или несколько строк слишком длинны
Различия файлов скрыты, потому что одна или несколько строк слишком длинны
|
|
@ -150,12 +150,7 @@ func (g *generator) proxyVmss() *arm.Resource {
|
|||
}
|
||||
|
||||
trailer := base64.StdEncoding.EncodeToString([]byte(`yum -y update -x WALinuxAgent
|
||||
yum -y install podman podman-docker --enablerepo rhui-rhel-7-server-rhui-extras-rpms
|
||||
|
||||
# https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux_atomic_host/7/html/managing_containers/running_containers_as_systemd_services_with_podman
|
||||
# Need to set this if SELinux is enabled
|
||||
setsebool -P container_manage_cgroup on
|
||||
|
||||
yum -y install docker
|
||||
|
||||
firewall-cmd --add-port=443/tcp --permanent
|
||||
|
||||
|
|
@ -169,6 +164,7 @@ cat >/root/.docker/config.json <<EOF
|
|||
}
|
||||
}
|
||||
EOF
|
||||
systemctl start docker.service
|
||||
docker pull "$PROXYIMAGE"
|
||||
|
||||
mkdir /etc/proxy
|
||||
|
|
@ -184,7 +180,8 @@ EOF
|
|||
|
||||
cat >/etc/systemd/system/proxy.service <<'EOF'
|
||||
[Unit]
|
||||
Description=Proxy container
|
||||
After=docker.service
|
||||
Requires=docker.service
|
||||
|
||||
[Service]
|
||||
EnvironmentFile=/etc/sysconfig/proxy
|
||||
|
|
@ -825,14 +822,10 @@ gpgcheck=yes
|
|||
EOF
|
||||
|
||||
for attempt in {1..5}; do
|
||||
yum --enablerepo=rhui-rhel-7-server-rhui-optional-rpms --enablerepo=rhui-rhel-7-server-rhui-extras-rpms -y install azsec-clamav azsec-monitor azure-cli azure-mdsd azure-security podman podman-docker openssl-perl td-agent-bit && break
|
||||
yum --enablerepo=rhui-rhel-7-server-rhui-optional-rpms -y install azsec-clamav azsec-monitor azure-cli azure-mdsd azure-security docker openssl-perl td-agent-bit && break
|
||||
if [[ ${attempt} -lt 5 ]]; then sleep 10; else exit 1; fi
|
||||
done
|
||||
|
||||
|
||||
# Allow systemd to run containers
|
||||
setsebool -P container_manage_cgroup on
|
||||
|
||||
rpm -e $(rpm -qa | grep ^abrt-)
|
||||
cat >/etc/sysctl.d/01-disable-core.conf <<'EOF'
|
||||
kernel.core_pattern = |/bin/true
|
||||
|
|
@ -869,12 +862,10 @@ EOF
|
|||
az login -i
|
||||
az account set -s "$SUBSCRIPTIONID"
|
||||
|
||||
>/etc/containers/nodocker # podman stderr output confuses az acr login
|
||||
mkdir -p /root/.docker
|
||||
REGISTRY_AUTH_FILE=/root/.docker/config.json az acr login --name "$(sed -e 's|.*/||' <<<"$ACRRESOURCEID")"
|
||||
systemctl start docker.service
|
||||
az acr login --name "$(sed -e 's|.*/||' <<<"$ACRRESOURCEID")"
|
||||
|
||||
MDMIMAGE="${RPIMAGE%%/*}/${MDMIMAGE##*/}"
|
||||
|
||||
docker pull "$MDMIMAGE"
|
||||
docker pull "$RPIMAGE"
|
||||
|
||||
|
|
@ -895,7 +886,8 @@ EOF
|
|||
mkdir /var/etw
|
||||
cat >/etc/systemd/system/mdm.service <<'EOF'
|
||||
[Unit]
|
||||
Description=MDM Service
|
||||
After=docker.service
|
||||
Requires=docker.service
|
||||
|
||||
[Service]
|
||||
EnvironmentFile=/etc/sysconfig/mdm
|
||||
|
|
@ -940,7 +932,8 @@ EOF
|
|||
|
||||
cat >/etc/systemd/system/aro-rp.service <<'EOF'
|
||||
[Unit]
|
||||
Description=RP Service
|
||||
After=docker.service
|
||||
Requires=docker.service
|
||||
|
||||
[Service]
|
||||
EnvironmentFile=/etc/sysconfig/aro-rp
|
||||
|
|
@ -987,7 +980,8 @@ EOF
|
|||
|
||||
cat >/etc/systemd/system/aro-monitor.service <<'EOF'
|
||||
[Unit]
|
||||
Description=ARO Monitor Service
|
||||
After=docker.service
|
||||
Requires=docker.service
|
||||
|
||||
[Service]
|
||||
EnvironmentFile=/etc/sysconfig/aro-monitor
|
||||
|
|
@ -1031,6 +1025,8 @@ EOF
|
|||
|
||||
cat >/etc/systemd/system/aro-portal.service <<'EOF'
|
||||
[Unit]
|
||||
After=docker.service
|
||||
Requires=docker.service
|
||||
StartLimitInterval=0
|
||||
|
||||
[Service]
|
||||
|
|
@ -1973,7 +1969,7 @@ enabled=yes
|
|||
gpgcheck=yes
|
||||
EOF
|
||||
|
||||
yum --enablerepo=rhui-rhel-7-server-rhui-optional-rpms --enablerepo=rhui-rhel-7-server-rhui-extras-rpms -y install azure-cli podman podman-docker jq libassuan-devel gcc gpgme-devel rh-git29 rh-python36 tmpwatch
|
||||
yum --enablerepo=rhui-rhel-7-server-rhui-optional-rpms -y install azure-cli docker jq libassuan-devel gcc gpgme-devel rh-git29 rh-python36 tmpwatch
|
||||
|
||||
GO_VERSION=1.14.9
|
||||
curl https://dl.google.com/go/go${GO_VERSION}.linux-amd64.tar.gz | tar -C /usr/local -xz
|
||||
|
|
@ -2003,6 +1999,10 @@ PKG_CONFIG_PATH=/opt/rh/rh-python36/root/usr/lib64/pkgconfig
|
|||
XDG_DATA_DIRS=/opt/rh/rh-python36/root/usr/share:/usr/local/share:/usr/share
|
||||
EOF
|
||||
|
||||
sed -i -e 's/^OPTIONS='\''/OPTIONS='\''-G cloud-user /' /etc/sysconfig/docker
|
||||
|
||||
systemctl enable docker
|
||||
|
||||
cat >/etc/cron.hourly/tmpwatch <<'EOF'
|
||||
#!/bin/bash
|
||||
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче