зеркало из https://github.com/Azure/ARO-RP.git
Bump golang version on CI VMs for security (#2377)
This commit is contained in:
Родитель
1b1c567801
Коммит
5b76c8e3f0
|
@ -236,7 +236,7 @@
|
|||
"autoUpgradeMinorVersion": true,
|
||||
"settings": {},
|
||||
"protectedSettings": {
|
||||
"script": "[base64(concat(base64ToString('c2V0IC1lCgo='),'CIAZPTOKEN=''',parameters('ciAzpToken'),'''\n','CIPOOLNAME=''',parameters('ciPoolName'),'''\n','\n',base64ToString('CiMgSGFjayAtIHdhaXQgb24gY3JlYXRlIGJlY2F1c2UgdGhlIFdBTGludXhBZ2VudCBzb21ldGltZXMgY29uZmxpY3RzIHdpdGggdGhlIHl1bSB1cGRhdGUgLXkgYmVsb3cKc2xlZXAgNjAKCmZvciBhdHRlbXB0IGluIHsxLi41fTsgZG8KICB5dW0gLXkgdXBkYXRlICYmIGJyZWFrCiAgaWYgW1sgJHthdHRlbXB0fSAtbHQgNSBdXTsgdGhlbiBzbGVlcCAxMDsgZWxzZSBleGl0IDE7IGZpCmRvbmUKCmx2ZXh0ZW5kIC1sICs1MCVGUkVFIC9kZXYvcm9vdHZnL2hvbWVsdgp4ZnNfZ3Jvd2ZzIC9ob21lCgpsdmV4dGVuZCAtbCArNTAlRlJFRSAvZGV2L3Jvb3R2Zy90bXBsdgp4ZnNfZ3Jvd2ZzIC90bXAKCmx2ZXh0ZW5kIC1sICsxMDAlRlJFRSAvZGV2L3Jvb3R2Zy92YXJsdgp4ZnNfZ3Jvd2ZzIC92YXIKCnJwbSAtLWltcG9ydCBodHRwczovL2RsLmZlZG9yYXByb2plY3Qub3JnL3B1Yi9lcGVsL1JQTS1HUEctS0VZLUVQRUwtOApycG0gLS1pbXBvcnQgaHR0cHM6Ly9wYWNrYWdlcy5taWNyb3NvZnQuY29tL2tleXMvbWljcm9zb2Z0LmFzYwoKeXVtIC15IGluc3RhbGwgaHR0cHM6Ly9kbC5mZWRvcmFwcm9qZWN0Lm9yZy9wdWIvZXBlbC9lcGVsLXJlbGVhc2UtbGF0ZXN0LTgubm9hcmNoLnJwbQoKY2F0ID4vZXRjL3l1bS5yZXBvcy5kL2F6dXJlLnJlcG8gPDwnRU9GJwpbYXp1cmUtY2xpXQpuYW1lPWF6dXJlLWNsaQpiYXNldXJsPWh0dHBzOi8vcGFja2FnZXMubWljcm9zb2Z0LmNvbS95dW1yZXBvcy9henVyZS1jbGkKZW5hYmxlZD15ZXMKZ3BnY2hlY2s9eWVzCkVPRgoKeXVtIC15IGluc3RhbGwgYXp1cmUtY2xpIHBvZG1hbiBwb2RtYW4tZG9ja2VyIGpxIGdjYyBncGdtZS1kZXZlbCBsaWJhc3N1YW4tZGV2ZWwgZ2l0IG1ha2UgdG1wd2F0Y2ggcHl0aG9uMy1kZXZlbCBodG9wIGdvLXRvb2xzZXQtMS4xNy43LTEubW9kdWxlK2VsOC42LjArMTQyOTcrMzJhMTVlMTkgb3BlbnZwbgoKIyBTdXBwcmVzcyBlbXVsYXRpb24gb3V0cHV0IGZvciBwb2RtYW4gaW5zdGVhZCBvZiBkb2NrZXIgZm9yIGF6IGFjciBjb21wYXRhYmlsaXR5Cm1rZGlyIC1wIC9ldGMvY29udGFpbmVycy8KdG91Y2ggL2V0Yy9jb250YWluZXJzL25vZG9ja2VyCgpWU1RTX0FHRU5UX1ZFUlNJT049Mi4xOTMuMQpta2RpciAvaG9tZS9jbG91ZC11c2VyL2FnZW50CnB1c2hkIC9ob21lL2Nsb3VkLXVzZXIvYWdlbnQKY3VybCAtcyBodHRwczovL3ZzdHNhZ2VudHBhY2thZ2UuYXp1cmVlZGdlLm5ldC9hZ2VudC8ke1ZTVFNfQUdFTlRfVkVSU0lPTn0vdnN0cy1hZ2VudC1saW51eC14NjQtJHtWU1RTX0FHRU5UX1ZFUlNJT059LnRhci5neiB8IHRhciAteHoKY2hvd24gLVIgY2xvdWQtdXNlcjpjbG91ZC11c2VyIC4KCi4vYmluL2luc3RhbGxkZXBlbmRlbmNpZXMuc2gKc3VkbyAtdSBjbG91ZC11c2VyIC4vY29uZmlnLnNoIC0tdW5hdHRlbmRlZCAtLXVybCBodHRwczovL2Rldi5henVyZS5jb20vbXNhenVyZSAtLWF1dGggcGF0IC0tdG9rZW4gIiRDSUFaUFRPS0VOIiAtLXBvb2wgIiRDSVBPT0xOQU1FIiAtLWFnZW50ICJBUk8tUkhFTC0kSE9TVE5BTUUiIC0tcmVwbGFjZQouL3N2Yy5zaCBpbnN0YWxsIGNsb3VkLXVzZXIKcG9wZAoKY2F0ID4vaG9tZS9jbG91ZC11c2VyL2FnZW50Ly5wYXRoIDw8J0VPRicKL3Vzci9sb2NhbC9iaW46L3Vzci9iaW46L3Vzci9sb2NhbC9zYmluOi91c3Ivc2JpbjovaG9tZS9jbG91ZC11c2VyLy5sb2NhbC9iaW46L2hvbWUvY2xvdWQtdXNlci9iaW4KRU9GCgojIFNldCB0aGUgYWdlbnQncyAiU3lzdGVtIGNhcGFiaWxpdGllcyIgZm9yIHRlc3RzIChnby0xLjE3IGFuZCBHT0xBTkdfRklQUykgaW4gdGhlIGFnZW50J3MgLmVudiBmaWxlCiMgYW5kIGFkZCBhIEhBQ0sgZm9yIFhER19SVU5USU1FX0RJUjogaHR0cHM6Ly9naXRodWIuY29tL2NvbnRhaW5lcnMvcG9kbWFuL2lzc3Vlcy80MjcKY2F0ID4vaG9tZS9jbG91ZC11c2VyL2FnZW50Ly5lbnYgPDwnRU9GJwpnby0xLjE3PXRydWUKR09MQU5HX0ZJUFM9MQpYREdfUlVOVElNRV9ESVI9L3J1bi91c2VyLzEwMDAKRU9GCgpjYXQgPi9ldGMvY3Jvbi53ZWVrbHkveXVtdXBkYXRlIDw8J0VPRicKIyEvYmluL2Jhc2gKCnl1bSB1cGRhdGUgLXkKRU9GCmNobW9kICt4IC9ldGMvY3Jvbi53ZWVrbHkveXVtdXBkYXRlCgpjYXQgPi9ldGMvY3Jvbi5ob3VybHkvdG1wd2F0Y2ggPDwnRU9GJwojIS9iaW4vYmFzaAoKZXhlYyAvc2Jpbi90bXB3YXRjaCAyNGggL3RtcApFT0YKY2htb2QgK3ggL2V0Yy9jcm9uLmhvdXJseS90bXB3YXRjaAoKIyBIQUNLIC0gcG9kbWFuIGRvZXNuJ3QgYWx3YXlzIHRlcm1pbmF0ZSBvciBjbGVhbiB1cCBpdCdzIHBhdXNlLnBpZCBmaWxlIGNhdXNpbmcKIyAnY2Fubm90IHJlZXhlYyBlcnJvcnMnIHNvIGF0dGVtcHQgdG8gY2xlYW4gaXQgdXAgZXZlcnkgbWludXRlIHRvIGtlZXAgcGlwZWxpbmVzIHJ1bm5pbmcKIyBzbW9vdGhseQpjYXQgPi91c3IvbG9jYWwvYmluL2ZpeC1wb2RtYW4tcGF1c2Uuc2ggPDwnRU9GJwojIS9iaW4vYmFzaAoKUEFVU0VfRklMRT0nL3RtcC9wb2RtYW4tcnVuLTEwMDAvbGlicG9kL3RtcC9wYXVzZS5waWQnCgppZiBbIC1mICIke1BBVVNFX0ZJTEV9IiBdOyB0aGVuCglQSUQ9JChjYXQgJHtQQVVTRV9GSUxFfSkKCWlmICEgcHMgLXAgJFBJRCA+IC9kZXYvbnVsbDsgdGhlbgoJCXJtICRQQVVTRV9GSUxFCglmaQpmaQpFT0YKY2htb2QgK3ggL3Vzci9sb2NhbC9iaW4vZml4LXBvZG1hbi1wYXVzZS5zaAoKIyBIQUNLIC0gL3RtcCB3aWxsIGZpbGwgdXAgY2F1c2luZyBidWlsZCBmYWlsdXJlcwojIGRlbGV0ZSBhbnl0aGluZyBub3QgYWNjZXNzZWQgd2l0aGluIDIgZGF5cwpjYXQgPi91c3IvbG9jYWwvYmluL2NsZWFuLXRtcC5zaCA8PCdFT0YnCiMhL2Jpbi9iYXNoCgpmaW5kIC90bXAgLXR5cGUgZiBcKCAhIC11c2VyIHJvb3QgXCkgLWF0aW1lICsyIC1kZWxldGUKCkVPRgpjaG1vZCAreCAvdXNyL2xvY2FsL2Jpbi9jbGVhbi10bXAuc2gKCmVjaG8gIjAgMCAqLzEgKiAqIC91c3IvbG9jYWwvYmluL2NsZWFuLXRtcC5zaCIgPj4gY3JvbgplY2hvICIqICogKiAqICogL3Vzci9sb2NhbC9iaW4vZml4LXBvZG1hbi1wYXVzZS5zaCIgPj4gY3JvbgoKIyBIQUNLIC0gaHR0cHM6Ly9naXRodWIuY29tL2NvbnRhaW5lcnMvcG9kbWFuL2lzc3Vlcy85MDAyCmVjaG8gIkByZWJvb3QgbG9naW5jdGwgZW5hYmxlLWxpbmdlciBjbG91ZC11c2VyIiA+PiBjcm9uCgpjcm9udGFiIGNyb24Kcm0gY3JvbgoKKHNsZWVwIDMwOyByZWJvb3QpICYK')))]"
|
||||
"script": "[base64(concat(base64ToString('c2V0IC1lCgo='),'CIAZPTOKEN=''',parameters('ciAzpToken'),'''\n','CIPOOLNAME=''',parameters('ciPoolName'),'''\n','\n',base64ToString('CiMgSGFjayAtIHdhaXQgb24gY3JlYXRlIGJlY2F1c2UgdGhlIFdBTGludXhBZ2VudCBzb21ldGltZXMgY29uZmxpY3RzIHdpdGggdGhlIHl1bSB1cGRhdGUgLXkgYmVsb3cKc2xlZXAgNjAKCmZvciBhdHRlbXB0IGluIHsxLi41fTsgZG8KICB5dW0gLXkgdXBkYXRlICYmIGJyZWFrCiAgaWYgW1sgJHthdHRlbXB0fSAtbHQgNSBdXTsgdGhlbiBzbGVlcCAxMDsgZWxzZSBleGl0IDE7IGZpCmRvbmUKCmx2ZXh0ZW5kIC1sICs1MCVGUkVFIC9kZXYvcm9vdHZnL2hvbWVsdgp4ZnNfZ3Jvd2ZzIC9ob21lCgpsdmV4dGVuZCAtbCArNTAlRlJFRSAvZGV2L3Jvb3R2Zy90bXBsdgp4ZnNfZ3Jvd2ZzIC90bXAKCmx2ZXh0ZW5kIC1sICsxMDAlRlJFRSAvZGV2L3Jvb3R2Zy92YXJsdgp4ZnNfZ3Jvd2ZzIC92YXIKCnJwbSAtLWltcG9ydCBodHRwczovL2RsLmZlZG9yYXByb2plY3Qub3JnL3B1Yi9lcGVsL1JQTS1HUEctS0VZLUVQRUwtOApycG0gLS1pbXBvcnQgaHR0cHM6Ly9wYWNrYWdlcy5taWNyb3NvZnQuY29tL2tleXMvbWljcm9zb2Z0LmFzYwoKeXVtIC15IGluc3RhbGwgaHR0cHM6Ly9kbC5mZWRvcmFwcm9qZWN0Lm9yZy9wdWIvZXBlbC9lcGVsLXJlbGVhc2UtbGF0ZXN0LTgubm9hcmNoLnJwbQoKY2F0ID4vZXRjL3l1bS5yZXBvcy5kL2F6dXJlLnJlcG8gPDwnRU9GJwpbYXp1cmUtY2xpXQpuYW1lPWF6dXJlLWNsaQpiYXNldXJsPWh0dHBzOi8vcGFja2FnZXMubWljcm9zb2Z0LmNvbS95dW1yZXBvcy9henVyZS1jbGkKZW5hYmxlZD15ZXMKZ3BnY2hlY2s9eWVzCkVPRgoKeXVtIC15IGluc3RhbGwgYXp1cmUtY2xpIHBvZG1hbiBwb2RtYW4tZG9ja2VyIGpxIGdjYyBncGdtZS1kZXZlbCBsaWJhc3N1YW4tZGV2ZWwgZ2l0IG1ha2UgdG1wd2F0Y2ggcHl0aG9uMy1kZXZlbCBodG9wIGdvLXRvb2xzZXQtMS4xNy4xMi0xLm1vZHVsZStlbDguNi4wKzE2MDE0K2EzNzJjMDBiIG9wZW52cG4KCiMgU3VwcHJlc3MgZW11bGF0aW9uIG91dHB1dCBmb3IgcG9kbWFuIGluc3RlYWQgb2YgZG9ja2VyIGZvciBheiBhY3IgY29tcGF0YWJpbGl0eQpta2RpciAtcCAvZXRjL2NvbnRhaW5lcnMvCnRvdWNoIC9ldGMvY29udGFpbmVycy9ub2RvY2tlcgoKVlNUU19BR0VOVF9WRVJTSU9OPTIuMTkzLjEKbWtkaXIgL2hvbWUvY2xvdWQtdXNlci9hZ2VudApwdXNoZCAvaG9tZS9jbG91ZC11c2VyL2FnZW50CmN1cmwgLXMgaHR0cHM6Ly92c3RzYWdlbnRwYWNrYWdlLmF6dXJlZWRnZS5uZXQvYWdlbnQvJHtWU1RTX0FHRU5UX1ZFUlNJT059L3ZzdHMtYWdlbnQtbGludXgteDY0LSR7VlNUU19BR0VOVF9WRVJTSU9OfS50YXIuZ3ogfCB0YXIgLXh6CmNob3duIC1SIGNsb3VkLXVzZXI6Y2xvdWQtdXNlciAuCgouL2Jpbi9pbnN0YWxsZGVwZW5kZW5jaWVzLnNoCnN1ZG8gLXUgY2xvdWQtdXNlciAuL2NvbmZpZy5zaCAtLXVuYXR0ZW5kZWQgLS11cmwgaHR0cHM6Ly9kZXYuYXp1cmUuY29tL21zYXp1cmUgLS1hdXRoIHBhdCAtLXRva2VuICIkQ0lBWlBUT0tFTiIgLS1wb29sICIkQ0lQT09MTkFNRSIgLS1hZ2VudCAiQVJPLVJIRUwtJEhPU1ROQU1FIiAtLXJlcGxhY2UKLi9zdmMuc2ggaW5zdGFsbCBjbG91ZC11c2VyCnBvcGQKCmNhdCA+L2hvbWUvY2xvdWQtdXNlci9hZ2VudC8ucGF0aCA8PCdFT0YnCi91c3IvbG9jYWwvYmluOi91c3IvYmluOi91c3IvbG9jYWwvc2JpbjovdXNyL3NiaW46L2hvbWUvY2xvdWQtdXNlci8ubG9jYWwvYmluOi9ob21lL2Nsb3VkLXVzZXIvYmluCkVPRgoKIyBTZXQgdGhlIGFnZW50J3MgIlN5c3RlbSBjYXBhYmlsaXRpZXMiIGZvciB0ZXN0cyAoZ28tMS4xNyBhbmQgR09MQU5HX0ZJUFMpIGluIHRoZSBhZ2VudCdzIC5lbnYgZmlsZQojIGFuZCBhZGQgYSBIQUNLIGZvciBYREdfUlVOVElNRV9ESVI6IGh0dHBzOi8vZ2l0aHViLmNvbS9jb250YWluZXJzL3BvZG1hbi9pc3N1ZXMvNDI3CmNhdCA+L2hvbWUvY2xvdWQtdXNlci9hZ2VudC8uZW52IDw8J0VPRicKZ28tMS4xNz10cnVlCkdPTEFOR19GSVBTPTEKWERHX1JVTlRJTUVfRElSPS9ydW4vdXNlci8xMDAwCkVPRgoKY2F0ID4vZXRjL2Nyb24ud2Vla2x5L3l1bXVwZGF0ZSA8PCdFT0YnCiMhL2Jpbi9iYXNoCgp5dW0gdXBkYXRlIC15CkVPRgpjaG1vZCAreCAvZXRjL2Nyb24ud2Vla2x5L3l1bXVwZGF0ZQoKY2F0ID4vZXRjL2Nyb24uaG91cmx5L3RtcHdhdGNoIDw8J0VPRicKIyEvYmluL2Jhc2gKCmV4ZWMgL3NiaW4vdG1wd2F0Y2ggMjRoIC90bXAKRU9GCmNobW9kICt4IC9ldGMvY3Jvbi5ob3VybHkvdG1wd2F0Y2gKCiMgSEFDSyAtIHBvZG1hbiBkb2Vzbid0IGFsd2F5cyB0ZXJtaW5hdGUgb3IgY2xlYW4gdXAgaXQncyBwYXVzZS5waWQgZmlsZSBjYXVzaW5nCiMgJ2Nhbm5vdCByZWV4ZWMgZXJyb3JzJyBzbyBhdHRlbXB0IHRvIGNsZWFuIGl0IHVwIGV2ZXJ5IG1pbnV0ZSB0byBrZWVwIHBpcGVsaW5lcyBydW5uaW5nCiMgc21vb3RobHkKY2F0ID4vdXNyL2xvY2FsL2Jpbi9maXgtcG9kbWFuLXBhdXNlLnNoIDw8J0VPRicKIyEvYmluL2Jhc2gKClBBVVNFX0ZJTEU9Jy90bXAvcG9kbWFuLXJ1bi0xMDAwL2xpYnBvZC90bXAvcGF1c2UucGlkJwoKaWYgWyAtZiAiJHtQQVVTRV9GSUxFfSIgXTsgdGhlbgoJUElEPSQoY2F0ICR7UEFVU0VfRklMRX0pCglpZiAhIHBzIC1wICRQSUQgPiAvZGV2L251bGw7IHRoZW4KCQlybSAkUEFVU0VfRklMRQoJZmkKZmkKRU9GCmNobW9kICt4IC91c3IvbG9jYWwvYmluL2ZpeC1wb2RtYW4tcGF1c2Uuc2gKCiMgSEFDSyAtIC90bXAgd2lsbCBmaWxsIHVwIGNhdXNpbmcgYnVpbGQgZmFpbHVyZXMKIyBkZWxldGUgYW55dGhpbmcgbm90IGFjY2Vzc2VkIHdpdGhpbiAyIGRheXMKY2F0ID4vdXNyL2xvY2FsL2Jpbi9jbGVhbi10bXAuc2ggPDwnRU9GJwojIS9iaW4vYmFzaAoKZmluZCAvdG1wIC10eXBlIGYgXCggISAtdXNlciByb290IFwpIC1hdGltZSArMiAtZGVsZXRlCgpFT0YKY2htb2QgK3ggL3Vzci9sb2NhbC9iaW4vY2xlYW4tdG1wLnNoCgplY2hvICIwIDAgKi8xICogKiAvdXNyL2xvY2FsL2Jpbi9jbGVhbi10bXAuc2giID4+IGNyb24KZWNobyAiKiAqICogKiAqIC91c3IvbG9jYWwvYmluL2ZpeC1wb2RtYW4tcGF1c2Uuc2giID4+IGNyb24KCiMgSEFDSyAtIGh0dHBzOi8vZ2l0aHViLmNvbS9jb250YWluZXJzL3BvZG1hbi9pc3N1ZXMvOTAwMgplY2hvICJAcmVib290IGxvZ2luY3RsIGVuYWJsZS1saW5nZXIgY2xvdWQtdXNlciIgPj4gY3JvbgoKY3JvbnRhYiBjcm9uCnJtIGNyb24KCihzbGVlcCAzMDsgcmVib290KSAmCg==')))]"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -338,7 +338,7 @@ enabled=yes
|
|||
gpgcheck=yes
|
||||
EOF
|
||||
|
||||
yum -y install azure-cli podman podman-docker jq gcc gpgme-devel libassuan-devel git make tmpwatch python3-devel htop go-toolset-1.17.7-1.module+el8.6.0+14297+32a15e19 openvpn
|
||||
yum -y install azure-cli podman podman-docker jq gcc gpgme-devel libassuan-devel git make tmpwatch python3-devel htop go-toolset-1.17.12-1.module+el8.6.0+16014+a372c00b openvpn
|
||||
|
||||
# Suppress emulation output for podman instead of docker for az acr compatability
|
||||
mkdir -p /etc/containers/
|
||||
|
|
Загрузка…
Ссылка в новой задаче